From 7d05455296765d8139e4d16302f9a70be8df873c Mon Sep 17 00:00:00 2001 From: Worros Date: Sun, 27 Feb 2011 20:52:17 +0800 Subject: [PATCH 1/8] THP: Ignore several errors tourneyId, tourneyTypeId, tourneysPlayersIds are variable, --- pyfpdb/TestHandsPlayers.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pyfpdb/TestHandsPlayers.py b/pyfpdb/TestHandsPlayers.py index 820c763f..58d56ba1 100644 --- a/pyfpdb/TestHandsPlayers.py +++ b/pyfpdb/TestHandsPlayers.py @@ -125,8 +125,11 @@ def compare_handsplayers_file(filename, importer, errors): # The stats match - continue pass else: - # Stats don't match - Doh! - errors.error_report(filename, hand, stat, ghash, testhash, p) + if stat == 'tourneyTypeId' or stat == 'tourneysPlayersIds': + # Not and error + pass + else: + errors.error_report(filename, hand, stat, ghash, testhash, p) except KeyError, e: errors.error_report(filename, False, "KeyError: '%s'" % stat, False, False, p) @@ -152,7 +155,7 @@ def compare_hands_file(filename, importer, errors): pass else: # Stats don't match. - if datum == "gametypeId" or datum == 'sessionId': + if datum == "gametypeId" or datum == 'sessionId' or datum == 'tourneyId': # Not an error. gametypeIds are dependent on the order added to the db. #print "DEBUG: Skipping mismatched gamtypeId" pass From 644b2d78498e870ecbd1791e2fe93cabbc69611f Mon Sep 17 00:00:00 2001 From: atinm Date: Sat, 26 Feb 2011 14:26:46 -0500 Subject: [PATCH 2/8] replaced /usr/bin/python with /usr/bin/env python --- pyfpdb/AlchemyFacilities.py | 2 +- pyfpdb/AlchemyMappings.py | 2 +- pyfpdb/AlchemyTables.py | 2 +- pyfpdb/Anonymise.py | 2 +- pyfpdb/Card.py | 2 +- pyfpdb/Charset.py | 2 +- pyfpdb/DerivedStats.py | 2 +- pyfpdb/Exceptions.py | 2 +- pyfpdb/Filters.py | 2 +- pyfpdb/FullTiltPokerSummary.py | 2 +- pyfpdb/GuiAutoImport.py | 2 +- pyfpdb/GuiBulkImport.py | 2 +- pyfpdb/GuiDatabase.py | 2 +- pyfpdb/GuiGraphViewer.py | 2 +- pyfpdb/GuiImapFetcher.py | 2 +- pyfpdb/GuiLogView.py | 2 +- pyfpdb/GuiPlayerStats.py | 2 +- pyfpdb/GuiPositionalStats.py | 2 +- pyfpdb/GuiPrefs.py | 2 +- pyfpdb/GuiRingPlayerStats.py | 2 +- pyfpdb/GuiSessionViewer.py | 2 +- pyfpdb/GuiStove.py | 2 +- pyfpdb/GuiTourneyGraphViewer.py | 2 +- pyfpdb/GuiTourneyImport.py | 2 +- pyfpdb/GuiTourneyPlayerStats.py | 2 +- pyfpdb/GuiTourneyViewer.py | 2 +- pyfpdb/Hand.py | 2 +- pyfpdb/HandHistory.py | 2 +- pyfpdb/HandHistoryConverter.py | 2 +- pyfpdb/IdentifySite.py | 2 +- pyfpdb/ImapFetcher.py | 2 +- pyfpdb/L10n.py | 2 +- pyfpdb/Options.py | 2 +- pyfpdb/PokerStarsSummary.py | 2 +- pyfpdb/ScriptAddStatToRegression.py | 2 +- pyfpdb/ScriptFetchWinamaxResults.py | 2 +- pyfpdb/SitenameSummary.py | 2 +- pyfpdb/SplitHandHistory.py | 2 +- pyfpdb/Stove.py | 2 +- pyfpdb/Summaries.py | 2 +- pyfpdb/SummaryEverleaf.py | 2 +- pyfpdb/TourneyFilters.py | 2 +- pyfpdb/TourneySummary.py | 2 +- pyfpdb/WinamaxSummary.py | 2 +- pyfpdb/fpdb.pyw | 2 +- pyfpdb/fpdb_import.py | 2 +- pyfpdb/regression-test-files/cash/TheBigGame/TBG-grabber.py | 2 +- pyfpdb/test_Database.py | 2 +- pyfpdb/test_Everleaf.py | 2 +- pyfpdb/test_FullTilt.py | 2 +- pyfpdb/test_PokerStars.py | 2 +- pyfpdb/windows_make_bats.py | 2 +- regression-test/PrintHand.py | 2 +- regression-test/PrintPlayerHudData.py | 2 +- regression-test/fpdb_util_lib.py | 2 +- run_fpdb.py | 2 +- setup.py | 2 +- utils/fix_table_desc.py | 4 ++-- 58 files changed, 59 insertions(+), 59 deletions(-) diff --git a/pyfpdb/AlchemyFacilities.py b/pyfpdb/AlchemyFacilities.py index fd2082d1..7d0d868e 100644 --- a/pyfpdb/AlchemyFacilities.py +++ b/pyfpdb/AlchemyFacilities.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2009-2010 Grigorij Indigirkin diff --git a/pyfpdb/AlchemyMappings.py b/pyfpdb/AlchemyMappings.py index b5891c25..f44bd42f 100644 --- a/pyfpdb/AlchemyMappings.py +++ b/pyfpdb/AlchemyMappings.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2009-2010 Grigorij Indigirkin diff --git a/pyfpdb/AlchemyTables.py b/pyfpdb/AlchemyTables.py index e89380a7..30e9d67d 100644 --- a/pyfpdb/AlchemyTables.py +++ b/pyfpdb/AlchemyTables.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2009-2010 Grigorij Indigirkin diff --git a/pyfpdb/Anonymise.py b/pyfpdb/Anonymise.py index 04f4185d..917cc3b5 100755 --- a/pyfpdb/Anonymise.py +++ b/pyfpdb/Anonymise.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2009-2010 Carl Gherardi diff --git a/pyfpdb/Card.py b/pyfpdb/Card.py index 8d426a0d..bb68fcf7 100755 --- a/pyfpdb/Card.py +++ b/pyfpdb/Card.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Carl Gherardi diff --git a/pyfpdb/Charset.py b/pyfpdb/Charset.py index f6ff05a7..8a1535dc 100644 --- a/pyfpdb/Charset.py +++ b/pyfpdb/Charset.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2010 Mika Bostrom diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py index 93c09571..b5cd8323 100644 --- a/pyfpdb/DerivedStats.py +++ b/pyfpdb/DerivedStats.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Carl Gherardi diff --git a/pyfpdb/Exceptions.py b/pyfpdb/Exceptions.py index 589f65cc..5bae0196 100644 --- a/pyfpdb/Exceptions.py +++ b/pyfpdb/Exceptions.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2009-2010 Matt Turnbull diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py index f19774c7..0a0937a2 100644 --- a/pyfpdb/Filters.py +++ b/pyfpdb/Filters.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/pyfpdb/FullTiltPokerSummary.py b/pyfpdb/FullTiltPokerSummary.py index 2edcd81e..0358b17e 100644 --- a/pyfpdb/FullTiltPokerSummary.py +++ b/pyfpdb/FullTiltPokerSummary.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py index 258dd975..7aa142cc 100755 --- a/pyfpdb/GuiAutoImport.py +++ b/pyfpdb/GuiAutoImport.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py index 8a95afa9..951b6d17 100755 --- a/pyfpdb/GuiBulkImport.py +++ b/pyfpdb/GuiBulkImport.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/pyfpdb/GuiDatabase.py b/pyfpdb/GuiDatabase.py index f77bcd74..d6a1f8d2 100755 --- a/pyfpdb/GuiDatabase.py +++ b/pyfpdb/GuiDatabase.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Carl Gherardi diff --git a/pyfpdb/GuiGraphViewer.py b/pyfpdb/GuiGraphViewer.py index 019d5085..b1784445 100644 --- a/pyfpdb/GuiGraphViewer.py +++ b/pyfpdb/GuiGraphViewer.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/pyfpdb/GuiImapFetcher.py b/pyfpdb/GuiImapFetcher.py index c312e17e..5e40b0e2 100644 --- a/pyfpdb/GuiImapFetcher.py +++ b/pyfpdb/GuiImapFetcher.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2010 Steffen Schaumburg diff --git a/pyfpdb/GuiLogView.py b/pyfpdb/GuiLogView.py index f28933a2..33e6e44c 100755 --- a/pyfpdb/GuiLogView.py +++ b/pyfpdb/GuiLogView.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Carl Gherardi diff --git a/pyfpdb/GuiPlayerStats.py b/pyfpdb/GuiPlayerStats.py index 34e8e122..e37a65a0 100644 --- a/pyfpdb/GuiPlayerStats.py +++ b/pyfpdb/GuiPlayerStats.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2010 Steffen Schaumburg diff --git a/pyfpdb/GuiPositionalStats.py b/pyfpdb/GuiPositionalStats.py index fc7ab83c..e0dc4f90 100644 --- a/pyfpdb/GuiPositionalStats.py +++ b/pyfpdb/GuiPositionalStats.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/pyfpdb/GuiPrefs.py b/pyfpdb/GuiPrefs.py index 166a2500..590f1ba1 100755 --- a/pyfpdb/GuiPrefs.py +++ b/pyfpdb/GuiPrefs.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Carl Gherardi diff --git a/pyfpdb/GuiRingPlayerStats.py b/pyfpdb/GuiRingPlayerStats.py index b42e6f50..21ffccce 100644 --- a/pyfpdb/GuiRingPlayerStats.py +++ b/pyfpdb/GuiRingPlayerStats.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/pyfpdb/GuiSessionViewer.py b/pyfpdb/GuiSessionViewer.py index 8a85fd30..1c907cc7 100644 --- a/pyfpdb/GuiSessionViewer.py +++ b/pyfpdb/GuiSessionViewer.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/pyfpdb/GuiStove.py b/pyfpdb/GuiStove.py index 98c878a8..af237eb5 100644 --- a/pyfpdb/GuiStove.py +++ b/pyfpdb/GuiStove.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/pyfpdb/GuiTourneyGraphViewer.py b/pyfpdb/GuiTourneyGraphViewer.py index 04f3b626..2a9bf1f5 100644 --- a/pyfpdb/GuiTourneyGraphViewer.py +++ b/pyfpdb/GuiTourneyGraphViewer.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Carl Gherardi diff --git a/pyfpdb/GuiTourneyImport.py b/pyfpdb/GuiTourneyImport.py index 3f24996b..3dd46966 100755 --- a/pyfpdb/GuiTourneyImport.py +++ b/pyfpdb/GuiTourneyImport.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Carl Gherardi diff --git a/pyfpdb/GuiTourneyPlayerStats.py b/pyfpdb/GuiTourneyPlayerStats.py index 672b4eb7..9ec4d533 100644 --- a/pyfpdb/GuiTourneyPlayerStats.py +++ b/pyfpdb/GuiTourneyPlayerStats.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2010 Steffen Schaumburg diff --git a/pyfpdb/GuiTourneyViewer.py b/pyfpdb/GuiTourneyViewer.py index eee83197..758ae4bf 100644 --- a/pyfpdb/GuiTourneyViewer.py +++ b/pyfpdb/GuiTourneyViewer.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2010 Steffen Schaumburg diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index 727ca00d..fc059282 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Carl Gherardi diff --git a/pyfpdb/HandHistory.py b/pyfpdb/HandHistory.py index bc6c118a..e0fe7552 100644 --- a/pyfpdb/HandHistory.py +++ b/pyfpdb/HandHistory.py @@ -192,4 +192,4 @@ if __name__== "__main__": print h.AWARDS for p in h.PLAYERS.keys(): - print h.PLAYERS[p] \ No newline at end of file + print h.PLAYERS[p] diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index 3f0c51bd..29610e15 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Carl Gherardi diff --git a/pyfpdb/IdentifySite.py b/pyfpdb/IdentifySite.py index 26a3e1e2..5f8afa8b 100755 --- a/pyfpdb/IdentifySite.py +++ b/pyfpdb/IdentifySite.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2010 Chaz Littlejohn diff --git a/pyfpdb/ImapFetcher.py b/pyfpdb/ImapFetcher.py index ba62673e..b3aa4ded 100644 --- a/pyfpdb/ImapFetcher.py +++ b/pyfpdb/ImapFetcher.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2010 Steffen Schaumburg diff --git a/pyfpdb/L10n.py b/pyfpdb/L10n.py index 9510df0b..d2b75ab7 100644 --- a/pyfpdb/L10n.py +++ b/pyfpdb/L10n.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2010 Steffen Schaumburg diff --git a/pyfpdb/Options.py b/pyfpdb/Options.py index e6591a4c..e0988705 100644 --- a/pyfpdb/Options.py +++ b/pyfpdb/Options.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Ray E. Barker diff --git a/pyfpdb/PokerStarsSummary.py b/pyfpdb/PokerStarsSummary.py index 01a9223b..07ce5521 100644 --- a/pyfpdb/PokerStarsSummary.py +++ b/pyfpdb/PokerStarsSummary.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/pyfpdb/ScriptAddStatToRegression.py b/pyfpdb/ScriptAddStatToRegression.py index 91f40408..23203317 100644 --- a/pyfpdb/ScriptAddStatToRegression.py +++ b/pyfpdb/ScriptAddStatToRegression.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2011 Carl Gherardi diff --git a/pyfpdb/ScriptFetchWinamaxResults.py b/pyfpdb/ScriptFetchWinamaxResults.py index 2bdab268..f0d4abcc 100644 --- a/pyfpdb/ScriptFetchWinamaxResults.py +++ b/pyfpdb/ScriptFetchWinamaxResults.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2011 Carl Gherardi diff --git a/pyfpdb/SitenameSummary.py b/pyfpdb/SitenameSummary.py index d06b9831..353f26ba 100644 --- a/pyfpdb/SitenameSummary.py +++ b/pyfpdb/SitenameSummary.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/pyfpdb/SplitHandHistory.py b/pyfpdb/SplitHandHistory.py index 52c1d340..02d9075e 100644 --- a/pyfpdb/SplitHandHistory.py +++ b/pyfpdb/SplitHandHistory.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2010 Chaz Littlejohn diff --git a/pyfpdb/Stove.py b/pyfpdb/Stove.py index 8600b255..1956522f 100755 --- a/pyfpdb/Stove.py +++ b/pyfpdb/Stove.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: iso-8859-15 # # stove.py diff --git a/pyfpdb/Summaries.py b/pyfpdb/Summaries.py index ca19ec7c..8cdd1f54 100644 --- a/pyfpdb/Summaries.py +++ b/pyfpdb/Summaries.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/pyfpdb/SummaryEverleaf.py b/pyfpdb/SummaryEverleaf.py index 3d079bef..f7d1c8b7 100644 --- a/pyfpdb/SummaryEverleaf.py +++ b/pyfpdb/SummaryEverleaf.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- # Copyright (c) 2009-2010 Eric Blade, and the FPDB team. diff --git a/pyfpdb/TourneyFilters.py b/pyfpdb/TourneyFilters.py index ae62cc6f..caa1fd65 100644 --- a/pyfpdb/TourneyFilters.py +++ b/pyfpdb/TourneyFilters.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2010 Steffen Schaumburg diff --git a/pyfpdb/TourneySummary.py b/pyfpdb/TourneySummary.py index d83ac1a8..ccc5cf59 100644 --- a/pyfpdb/TourneySummary.py +++ b/pyfpdb/TourneySummary.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2009-2010 Stephane Alessio diff --git a/pyfpdb/WinamaxSummary.py b/pyfpdb/WinamaxSummary.py index c3a5bd14..3d6d409f 100644 --- a/pyfpdb/WinamaxSummary.py +++ b/pyfpdb/WinamaxSummary.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2011 Carl Gherardi diff --git a/pyfpdb/fpdb.pyw b/pyfpdb/fpdb.pyw index 66083795..3c9acac2 100755 --- a/pyfpdb/fpdb.pyw +++ b/pyfpdb/fpdb.pyw @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py index 723c16ae..31bf54b7 100644 --- a/pyfpdb/fpdb_import.py +++ b/pyfpdb/fpdb_import.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/pyfpdb/regression-test-files/cash/TheBigGame/TBG-grabber.py b/pyfpdb/regression-test-files/cash/TheBigGame/TBG-grabber.py index befb78c6..e89bef16 100644 --- a/pyfpdb/regression-test-files/cash/TheBigGame/TBG-grabber.py +++ b/pyfpdb/regression-test-files/cash/TheBigGame/TBG-grabber.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- """Script to fetch all the of the data file from thebiggame.pokerstars.net""" diff --git a/pyfpdb/test_Database.py b/pyfpdb/test_Database.py index b415b7dc..c5716641 100644 --- a/pyfpdb/test_Database.py +++ b/pyfpdb/test_Database.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Carl Gherardi diff --git a/pyfpdb/test_Everleaf.py b/pyfpdb/test_Everleaf.py index 12c00590..7cf20005 100644 --- a/pyfpdb/test_Everleaf.py +++ b/pyfpdb/test_Everleaf.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2009-2010 Matt Turnbull diff --git a/pyfpdb/test_FullTilt.py b/pyfpdb/test_FullTilt.py index 432932a0..567b16fa 100644 --- a/pyfpdb/test_FullTilt.py +++ b/pyfpdb/test_FullTilt.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2009-2010 Matt Turnbull diff --git a/pyfpdb/test_PokerStars.py b/pyfpdb/test_PokerStars.py index 5824c471..f192fde6 100755 --- a/pyfpdb/test_PokerStars.py +++ b/pyfpdb/test_PokerStars.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2009-2010 Matt Turnbull diff --git a/pyfpdb/windows_make_bats.py b/pyfpdb/windows_make_bats.py index 39449fc7..6b1a58c0 100755 --- a/pyfpdb/windows_make_bats.py +++ b/pyfpdb/windows_make_bats.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2009-2010 Carl Gherardi diff --git a/regression-test/PrintHand.py b/regression-test/PrintHand.py index 98966f8b..dac8f001 100755 --- a/regression-test/PrintHand.py +++ b/regression-test/PrintHand.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/regression-test/PrintPlayerHudData.py b/regression-test/PrintPlayerHudData.py index f290a4dc..f15dde00 100755 --- a/regression-test/PrintPlayerHudData.py +++ b/regression-test/PrintPlayerHudData.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/regression-test/fpdb_util_lib.py b/regression-test/fpdb_util_lib.py index e5e0c86c..b3c608c9 100644 --- a/regression-test/fpdb_util_lib.py +++ b/regression-test/fpdb_util_lib.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Steffen Schaumburg diff --git a/run_fpdb.py b/run_fpdb.py index d5295386..cc62931f 100755 --- a/run_fpdb.py +++ b/run_fpdb.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2008-2010 Carl Gherardi diff --git a/setup.py b/setup.py index f114553d..ba59cd78 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Created by Mika Bostrom, released into the public domain as far as legally possible. diff --git a/utils/fix_table_desc.py b/utils/fix_table_desc.py index 46044f1c..74087ee4 100644 --- a/utils/fix_table_desc.py +++ b/utils/fix_table_desc.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python # -*- coding: utf-8 -*- #Copyright 2009-2010 Ray E. Barker @@ -54,4 +54,4 @@ for line in re.split("\n", desc): table += "|+\n" + line + "\n" table += "|}\n" -print table \ No newline at end of file +print table From c6926b6619b097afdaedfd20a6beb76f865612bd Mon Sep 17 00:00:00 2001 From: Worros Date: Mon, 28 Feb 2011 12:30:25 +0800 Subject: [PATCH 3/8] Regression: Add raiseToStealChance and raiseToStealDone to .hp files --- ...mit $0.02(Real Money) Table 9339866.txt.hp | 16 +++++++++++++++ ...ax-USD-0.25-0.50.200810.All.Streets.txt.hp | 16 +++++++++++++++ .../Flop/PLO-EUR-5-10-Unknown-Sample.txt.hp | 4 ++++ ...SD-0.01-0.02-201008.2Way.All-in.pre.txt.hp | 16 +++++++++++++++ .../3-Draw-Limit-USD-0.10-0.20-201011.txt.hp | 12 +++++++++++ .../3-Draw-Limit-USD-150-300-201012.txt.hp | 10 ++++++++++ ...011.Hero.sitting.out.but.not.listed.txt.hp | 8 ++++++++ ...D-0.10-0.20-201011.Sample.Not.UTF16.txt.hp | 12 ++++++++++- ...-0.20-201011.Saw.Showdown.Not.UTF16.txt.hp | 14 ++++++++++++- ...L-0.10-0.25-201011.Sample.Not.UTF16.txt.hp | 10 +++++++++- ...D-0.05-0.10-201011.Sample.Not.UTF16.txt.hp | 16 ++++++++++++++- ...2.201012.Button.Player4.Sitting.out.txt.hp | 14 +++++++++++++ ...1-0.02.201008.Weird.table.character.txt.hp | 12 +++++++++++ ...0.05.201007.Short.lived.date.format.txt.hp | 18 +++++++++++++++++ ...USD-0.01-0.02.201003.River.Showdown.txt.hp | 12 +++++++++++ ...3-6-20106.Steal.from.Button.Failure.txt.hp | 14 +++++++++++++ ...0-0.20-201012.CCT.and.ET.timeformat.txt.hp | 14 +++++++++++++ ...01012.Player6.listed.but.doesnt.act.txt.hp | 16 +++++++++++++++ ...50-1.00-201008.All-in.with.showdown.txt.hp | 10 ++++++++++ ...D-0.02-0.04-201102.Speed.table.BWin.txt.hp | 12 +++++++++++ ...USD-0.02-0.04-200903.All-in.on.turn.txt.hp | 12 +++++++++++ .../NLHE-USD-0.01-0.02-201008.Sample.txt.hp | 12 +++++++++++ ...00-200508.BB.and.Button.same.player.txt.hp | 4 ++++ ...6max-USD-0.05-0.10-200912.Allin-pre.txt.hp | 14 ++++++++++++- ...USD-0.25-0.50-201011.Capped.preflop.txt.hp | 14 +++++++++++++ ...NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp | 18 ++++++++++++++++- ....02-20100829.No.VPIP.from.posted.bb.txt.hp | 18 +++++++++++++++++ ...tudHL-USD-0.04-0.08-200911.Cardtest.txt.hp | 16 +++++++++++++++ ...it $0.02(Real Money) Table 25932774.txt.hp | 18 +++++++++++++++++ ...E-USD-0.05-0.10-Date-unknown.Sample.txt.hp | 6 ++++++ ...O-EUR-0.05-0.10-Date-unknown.Sample.txt.hp | 10 ++++++++++ ....05-201010.Invalid.side.pot.Player8.txt.hp | 18 +++++++++++++++++ ...th.bad.collected.Biggest.stack.wins.txt.hp | 18 +++++++++++++++++ ...0.Side.pot.Biggest.stack.loses.main.txt.hp | 20 ++++++++++++++++++- ...09.Real.side.pot.with.bad.collected.txt.hp | 18 +++++++++++++++++ ...-2-201102.Villain.allin.on.bringing.txt.hp | 6 +++++- 36 files changed, 470 insertions(+), 8 deletions(-) diff --git a/pyfpdb/regression-test-files/cash/Absolute/Flop/IHH20090610 Chile Way - Hold'em No Limit $0.02(Real Money) Table 9339866.txt.hp b/pyfpdb/regression-test-files/cash/Absolute/Flop/IHH20090610 Chile Way - Hold'em No Limit $0.02(Real Money) Table 9339866.txt.hp index 174b0f3d..f0cc2d53 100644 --- a/pyfpdb/regression-test-files/cash/Absolute/Flop/IHH20090610 Chile Way - Hold'em No Limit $0.02(Real Money) Table 9339866.txt.hp +++ b/pyfpdb/regression-test-files/cash/Absolute/Flop/IHH20090610 Chile Way - Hold'em No Limit $0.02(Real Money) Table 9339866.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -752,6 +766,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/Carbon/Flop/NLHE-9max-USD-0.25-0.50.200810.All.Streets.txt.hp b/pyfpdb/regression-test-files/cash/Carbon/Flop/NLHE-9max-USD-0.25-0.50.200810.All.Streets.txt.hp index fcecce5b..bb29e288 100644 --- a/pyfpdb/regression-test-files/cash/Carbon/Flop/NLHE-9max-USD-0.25-0.50.200810.All.Streets.txt.hp +++ b/pyfpdb/regression-test-files/cash/Carbon/Flop/NLHE-9max-USD-0.25-0.50.200810.All.Streets.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 292, 'sawShowdown': True, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': True, 'rake': 0, 'sawShowdown': True, @@ -752,6 +766,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hp b/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hp index 691c5a52..872e5ff7 100644 --- a/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hp +++ b/pyfpdb/regression-test-files/cash/Everest/Flop/PLO-EUR-5-10-Unknown-Sample.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': True, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 300, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/Everleaf/Flop/NLHE-10max-USD-0.01-0.02-201008.2Way.All-in.pre.txt.hp b/pyfpdb/regression-test-files/cash/Everleaf/Flop/NLHE-10max-USD-0.01-0.02-201008.2Way.All-in.pre.txt.hp index c941e73f..a26ae634 100644 --- a/pyfpdb/regression-test-files/cash/Everleaf/Flop/NLHE-10max-USD-0.01-0.02-201008.2Way.All-in.pre.txt.hp +++ b/pyfpdb/regression-test-files/cash/Everleaf/Flop/NLHE-10max-USD-0.01-0.02-201008.2Way.All-in.pre.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 9, 'sawShowdown': True, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -752,6 +766,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-0.10-0.20-201011.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-0.10-0.20-201011.txt.hp index c74bf089..3e4b210e 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-0.10-0.20-201011.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-0.10-0.20-201011.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 5, 'sawShowdown': True, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-150-300-201012.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-150-300-201012.txt.hp index 27a8cac5..5c0fca62 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-150-300-201012.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-150-300-201012.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': True, 'rake': 0, 'sawShowdown': True, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 300, 'sawShowdown': True, diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-250-500-201011.Hero.sitting.out.but.not.listed.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-250-500-201011.Hero.sitting.out.but.not.listed.txt.hp index ca3be971..15baf904 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-250-500-201011.Hero.sitting.out.but.not.listed.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/3-Draw-Limit-USD-250-500-201011.Hero.sitting.out.but.not.listed.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': True, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hp index 8adceffd..447880dd 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-Limit-USD-0.10-0.20-201011.Sample.Not.UTF16.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': True, 'rake': 10, 'sawShowdown': True, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -512,4 +522,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-NL-USD-0.10-0.20-201011.Saw.Showdown.Not.UTF16.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-NL-USD-0.10-0.20-201011.Saw.Showdown.Not.UTF16.txt.hp index 85a37e73..6e176351 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-NL-USD-0.10-0.20-201011.Saw.Showdown.Not.UTF16.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-NL-USD-0.10-0.20-201011.Saw.Showdown.Not.UTF16.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 60, 'sawShowdown': True, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -615,4 +627,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-PL-0.10-0.25-201011.Sample.Not.UTF16.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-PL-0.10-0.25-201011.Sample.Not.UTF16.txt.hp index 0bbc0953..16ee16a7 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-PL-0.10-0.25-201011.Sample.Not.UTF16.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/5-Carddraw-PL-0.10-0.25-201011.Sample.Not.UTF16.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 5, 'sawShowdown': True, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -409,4 +417,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Draw/Badugi-USD-0.05-0.10-201011.Sample.Not.UTF16.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Draw/Badugi-USD-0.05-0.10-201011.Sample.Not.UTF16.txt.hp index 169c5f0c..39d2eab5 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Draw/Badugi-USD-0.05-0.10-201011.Sample.Not.UTF16.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Draw/Badugi-USD-0.05-0.10-201011.Sample.Not.UTF16.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 5, 'sawShowdown': True, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -718,4 +732,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/FTP/Flop/LHE-9max-USD-1-2.201012.Button.Player4.Sitting.out.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Flop/LHE-9max-USD-1-2.201012.Button.Player4.Sitting.out.txt.hp index 4f5c207f..3625ce56 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Flop/LHE-9max-USD-1-2.201012.Button.Player4.Sitting.out.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Flop/LHE-9max-USD-1-2.201012.Button.Player4.Sitting.out.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 75, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': True, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-6max-EUR-0.01-0.02.201008.Weird.table.character.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-6max-EUR-0.01-0.02.201008.Weird.table.character.txt.hp index 7510c741..73922b2a 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-6max-EUR-0.01-0.02.201008.Weird.table.character.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-6max-EUR-0.01-0.02.201008.Weird.table.character.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': True, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-9max-USD-0.02-0.05.201007.Short.lived.date.format.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-9max-USD-0.02-0.05.201007.Short.lived.date.format.txt.hp index 73c93cc9..e29b90b7 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-9max-USD-0.02-0.05.201007.Short.lived.date.format.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-9max-USD-0.02-0.05.201007.Short.lived.date.format.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -752,6 +766,8 @@ 'otherRaisedStreet4': False, 'position': 6, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -855,6 +871,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/FTP/Flop/PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Flop/PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt.hp index da6dd693..d325cb41 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Flop/PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Flop/PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 6, 'sawShowdown': True, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, diff --git a/pyfpdb/regression-test-files/cash/FTP/Stud/7-Stud-USD-3-6-20106.Steal.from.Button.Failure.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Stud/7-Stud-USD-3-6-20106.Steal.from.Button.Failure.txt.hp index dbf7b285..d9bf25f9 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Stud/7-Stud-USD-3-6-20106.Steal.from.Button.Failure.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Stud/7-Stud-USD-3-6-20106.Steal.from.Button.Failure.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': True, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.CCT.and.ET.timeformat.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.CCT.and.ET.timeformat.txt.hp index 46a8ad32..51fb8075 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.CCT.and.ET.timeformat.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.CCT.and.ET.timeformat.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 5, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.Player6.listed.but.doesnt.act.txt.hp b/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.Player6.listed.but.doesnt.act.txt.hp index af7edc3e..6d122f1a 100644 --- a/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.Player6.listed.but.doesnt.act.txt.hp +++ b/pyfpdb/regression-test-files/cash/FTP/Stud/Razz-USD-0.10-0.20-201012.Player6.listed.but.doesnt.act.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -752,6 +766,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 2, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/OnGame/Flop/LHE-9max-USD-0.50-1.00-201008.All-in.with.showdown.txt.hp b/pyfpdb/regression-test-files/cash/OnGame/Flop/LHE-9max-USD-0.50-1.00-201008.All-in.with.showdown.txt.hp index 0091a810..b338c4ec 100644 --- a/pyfpdb/regression-test-files/cash/OnGame/Flop/LHE-9max-USD-0.50-1.00-201008.All-in.with.showdown.txt.hp +++ b/pyfpdb/regression-test-files/cash/OnGame/Flop/LHE-9max-USD-0.50-1.00-201008.All-in.with.showdown.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': True, 'rake': 215, 'sawShowdown': True, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, diff --git a/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hp b/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hp index 00b4d0f4..a8a665f5 100644 --- a/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hp +++ b/pyfpdb/regression-test-files/cash/OnGame/Flop/NLHE-10max-USD-0.02-0.04-201102.Speed.table.BWin.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 1, 'sawShowdown': True, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, diff --git a/pyfpdb/regression-test-files/cash/PKR/Flop/NLHE-2max-USD-0.02-0.04-200903.All-in.on.turn.txt.hp b/pyfpdb/regression-test-files/cash/PKR/Flop/NLHE-2max-USD-0.02-0.04-200903.All-in.on.turn.txt.hp index 71587ec7..656f7046 100644 --- a/pyfpdb/regression-test-files/cash/PKR/Flop/NLHE-2max-USD-0.02-0.04-200903.All-in.on.turn.txt.hp +++ b/pyfpdb/regression-test-files/cash/PKR/Flop/NLHE-2max-USD-0.02-0.04-200903.All-in.on.turn.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -130,6 +132,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -229,6 +233,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -328,6 +334,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 40, 'sawShowdown': True, @@ -427,6 +435,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -526,6 +536,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.01-0.02-201008.Sample.txt.hp b/pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.01-0.02-201008.Sample.txt.hp index 90478edb..405bb69a 100644 --- a/pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.01-0.02-201008.Sample.txt.hp +++ b/pyfpdb/regression-test-files/cash/PartyPoker/Flop/NLHE-USD-0.01-0.02-201008.Sample.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': True, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 3, 'sawShowdown': True, diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp index 1b594587..3484c3bf 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/LHE-USD-1.00-200508.BB.and.Button.same.player.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp index d5252c7a..3997648d 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-6max-USD-0.05-0.10-200912.Allin-pre.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 205, 'sawShowdown': True, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': True, 'rake': 0, 'sawShowdown': True, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -615,4 +627,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp index 5907e754..d425b52d 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-CAP-9max-USD-0.25-0.50-201011.Capped.preflop.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': True, 'rake': 100, 'sawShowdown': True, diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp index 88d1935e..0382901e 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/NLHE-FR-USD-0.01-0.02-201004.4betPF.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 10, 'sawShowdown': True, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -752,6 +766,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -821,4 +837,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-9max-USD-0.01-0.02-20100829.No.VPIP.from.posted.bb.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-9max-USD-0.01-0.02-20100829.No.VPIP.from.posted.bb.txt.hp index 1d327cfd..3090ded2 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-9max-USD-0.01-0.02-20100829.No.VPIP.from.posted.bb.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Flop/PLO8-9max-USD-0.01-0.02-20100829.No.VPIP.from.posted.bb.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -752,6 +766,8 @@ 'otherRaisedStreet4': False, 'position': 6, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -855,6 +871,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt.hp b/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt.hp index da11104a..85fa044d 100644 --- a/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt.hp +++ b/pyfpdb/regression-test-files/cash/Stars/Stud/7-StudHL-USD-0.04-0.08-200911.Cardtest.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': True, 'position': 6, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 2, 'sawShowdown': True, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': True, 'position': 4, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 2, 'sawShowdown': True, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -752,6 +766,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/UltimateBet/Flop/IHH20101106 Baseline Rd - Hold'em No Limit $0.02(Real Money) Table 25932774.txt.hp b/pyfpdb/regression-test-files/cash/UltimateBet/Flop/IHH20101106 Baseline Rd - Hold'em No Limit $0.02(Real Money) Table 25932774.txt.hp index 67337aba..22417e52 100644 --- a/pyfpdb/regression-test-files/cash/UltimateBet/Flop/IHH20101106 Baseline Rd - Hold'em No Limit $0.02(Real Money) Table 25932774.txt.hp +++ b/pyfpdb/regression-test-files/cash/UltimateBet/Flop/IHH20101106 Baseline Rd - Hold'em No Limit $0.02(Real Money) Table 25932774.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -752,6 +766,8 @@ 'otherRaisedStreet4': False, 'position': 6, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -855,6 +871,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': -2, 'sawShowdown': True, diff --git a/pyfpdb/regression-test-files/cash/Win2day/Flop/NLHE-USD-0.05-0.10-Date-unknown.Sample.txt.hp b/pyfpdb/regression-test-files/cash/Win2day/Flop/NLHE-USD-0.05-0.10-Date-unknown.Sample.txt.hp index 08298491..a5372ed1 100644 --- a/pyfpdb/regression-test-files/cash/Win2day/Flop/NLHE-USD-0.05-0.10-Date-unknown.Sample.txt.hp +++ b/pyfpdb/regression-test-files/cash/Win2day/Flop/NLHE-USD-0.05-0.10-Date-unknown.Sample.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 3, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample.txt.hp b/pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample.txt.hp index cafbceda..b77dde1f 100644 --- a/pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample.txt.hp +++ b/pyfpdb/regression-test-files/cash/Win2day/Flop/PLO-EUR-0.05-0.10-Date-unknown.Sample.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 21, 'sawShowdown': True, diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp index c42f243a..f5ff9ff5 100644 --- a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp +++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 58, 'sawShowdown': True, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -752,6 +766,8 @@ 'otherRaisedStreet4': False, 'position': 6, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': True, 'rake': 0, 'sawShowdown': True, @@ -855,6 +871,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Real.side.pot.with.bad.collected.Biggest.stack.wins.txt.hp b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Real.side.pot.with.bad.collected.Biggest.stack.wins.txt.hp index a85c7280..d9aa08ea 100644 --- a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Real.side.pot.with.bad.collected.Biggest.stack.wins.txt.hp +++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Real.side.pot.with.bad.collected.Biggest.stack.wins.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 35, 'sawShowdown': True, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 6, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -752,6 +766,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -855,6 +871,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Side.pot.Biggest.stack.loses.main.txt.hp b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Side.pot.Biggest.stack.loses.main.txt.hp index 4fe149e1..e6d00418 100644 --- a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Side.pot.Biggest.stack.loses.main.txt.hp +++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Side.pot.Biggest.stack.loses.main.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 6, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': True, 'rake': 40, 'sawShowdown': True, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -752,6 +766,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 40, 'sawShowdown': True, @@ -855,6 +871,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -924,4 +942,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp b/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp index 22155cce..e86d3a80 100644 --- a/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp +++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 4, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 'B', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -237,6 +241,8 @@ 'otherRaisedStreet4': False, 'position': 3, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -340,6 +346,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -443,6 +451,8 @@ 'otherRaisedStreet4': False, 'position': 5, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -546,6 +556,8 @@ 'otherRaisedStreet4': False, 'position': 2, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -649,6 +661,8 @@ 'otherRaisedStreet4': False, 'position': 1, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -752,6 +766,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': False, @@ -855,6 +871,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 22, 'sawShowdown': True, diff --git a/pyfpdb/regression-test-files/tour/FTP/Stud/Razz-USD-HUSNG-2-201102.Villain.allin.on.bringing.txt.hp b/pyfpdb/regression-test-files/tour/FTP/Stud/Razz-USD-HUSNG-2-201102.Villain.allin.on.bringing.txt.hp index b5f7f2a3..c1d848d8 100644 --- a/pyfpdb/regression-test-files/tour/FTP/Stud/Razz-USD-HUSNG-2-201102.Villain.allin.on.bringing.txt.hp +++ b/pyfpdb/regression-test-files/tour/FTP/Stud/Razz-USD-HUSNG-2-201102.Villain.allin.on.bringing.txt.hp @@ -31,6 +31,8 @@ 'otherRaisedStreet4': False, 'position': 0, 'raiseFirstInChance': True, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -134,6 +136,8 @@ 'otherRaisedStreet4': False, 'position': 'S', 'raiseFirstInChance': False, + 'raiseToStealChance': False, + 'raiseToStealDone': False, 'raisedFirstIn': False, 'rake': 0, 'sawShowdown': True, @@ -203,4 +207,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} + 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file From 489a8da50afc1b03f3a8cd4a81320b5134b483e4 Mon Sep 17 00:00:00 2001 From: Worros Date: Mon, 28 Feb 2011 13:36:23 +0800 Subject: [PATCH 4/8] Winamax: Fix reverted(?) timezone update. --- pyfpdb/WinamaxToFpdb.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pyfpdb/WinamaxToFpdb.py b/pyfpdb/WinamaxToFpdb.py index 8f03351f..d34e92e5 100644 --- a/pyfpdb/WinamaxToFpdb.py +++ b/pyfpdb/WinamaxToFpdb.py @@ -212,13 +212,11 @@ class Winamax(HandHistoryConverter): a = self.re_DateTime.search(info[key]) if a: datetimestr = "%s/%s/%s %s:%s:%s" % (a.group('Y'),a.group('M'), a.group('D'), a.group('H'),a.group('MIN'),a.group('S')) - tzoffset = str(-time.timezone/3600) else: datetimestr = "2010/Jan/01 01:01:01" log.error(_("readHandInfo: DATETIME not matched: '%s'" % info[key])) -# print "DEBUG: readHandInfo: DATETIME not matched: '%s'" % info[key] - # TODO: Manually adjust time against OFFSET - hand.startTime = datetime.datetime.strptime(datetimestr, "%Y/%m/%d %H:%M:%S") # also timezone at end, e.g. " ET" + #print "DEBUG: readHandInfo: DATETIME not matched: '%s'" % info[key] + hand.startTime = datetime.datetime.strptime(datetimestr, "%Y/%m/%d %H:%M:%S") hand.startTime = HandHistoryConverter.changeTimezone(hand.startTime, "CET", "UTC") if key == 'HID1': # Need to remove non-alphanumerics for MySQL From b13b3a7047a601af161c7124f880baa27f47b9fa Mon Sep 17 00:00:00 2001 From: Worros Date: Mon, 28 Feb 2011 13:37:11 +0800 Subject: [PATCH 5/8] Regression: Fix .hands data --- ...02-0.05-201010.Side.pot.Biggest.stack.loses.main.txt.hands | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Side.pot.Biggest.stack.loses.main.txt.hands b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Side.pot.Biggest.stack.loses.main.txt.hands index eea9c712..ec2abc9c 100644 --- a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Side.pot.Biggest.stack.loses.main.txt.hands +++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Side.pot.Biggest.stack.loses.main.txt.hands @@ -15,8 +15,8 @@ 'seats': 9, 'sessionId': None, 'showdownPot': 0, - 'siteHandNo': u'289101161298319136', - 'startTime': datetime.datetime(2011, 2, 21, 19, 12, 16, tzinfo=pytz.utc), + 'siteHandNo': u'910116281298310000', + 'startTime': datetime.datetime(2011, 2, 21, 19, 12, 0, tzinfo=pytz.utc), 'street0Raises': 3, 'street1Pot': 1370, 'street1Raises': 0, From dbebc5b0b6d83d3b48cf118a0ffe6a9d0c7ffe92 Mon Sep 17 00:00:00 2001 From: Worros Date: Mon, 28 Feb 2011 14:21:09 +0800 Subject: [PATCH 6/8] Regression: Winamax: Fix data for Sqeeze --- ...2-0.05-201010.Invalid.side.pot.Player8.txt.hp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp index f5ff9ff5..06efc040 100644 --- a/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp +++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/NLHE-FR-EUR-0.02-0.05-201010.Invalid.side.pot.Player8.txt.hp @@ -55,7 +55,7 @@ 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, - 'street0_SqueezeChance': False, + 'street0_SqueezeChance': True, 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, @@ -160,7 +160,7 @@ 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, - 'street0_SqueezeChance': False, + 'street0_SqueezeChance': True, 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, @@ -265,7 +265,7 @@ 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, - 'street0_SqueezeChance': False, + 'street0_SqueezeChance': True, 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, @@ -370,7 +370,7 @@ 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, - 'street0_SqueezeChance': False, + 'street0_SqueezeChance': True, 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, @@ -475,7 +475,7 @@ 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, - 'street0_SqueezeChance': False, + 'street0_SqueezeChance': True, 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, @@ -580,7 +580,7 @@ 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, - 'street0_SqueezeChance': False, + 'street0_SqueezeChance': True, 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, @@ -685,7 +685,7 @@ 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, - 'street0_SqueezeChance': False, + 'street0_SqueezeChance': True, 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, @@ -942,4 +942,4 @@ 'wonWhenSeenStreet1': 0.0, 'wonWhenSeenStreet2': 0.0, 'wonWhenSeenStreet3': 0.0, - 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file + 'wonWhenSeenStreet4': 0.0}} From f85cbef28b7571bb52726e71dca2908e43bf709d Mon Sep 17 00:00:00 2001 From: Worros Date: Tue, 1 Mar 2011 13:19:05 +0800 Subject: [PATCH 7/8] Regression: Winamax street0_SqueezeChance fixes --- ...0.05-201009.Real.side.pot.with.bad.collected.txt.hp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp b/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp index e86d3a80..1c217874 100644 --- a/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp +++ b/pyfpdb/regression-test-files/cash/Winamax/Flop/PLO-FR-EUR-0.02-0.05-201009.Real.side.pot.with.bad.collected.txt.hp @@ -160,7 +160,7 @@ 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, - 'street0_SqueezeChance': False, + 'street0_SqueezeChance': True, 'street0_SqueezeDone': False, 'street1Aggr': True, 'street1Bets': 1, @@ -265,7 +265,7 @@ 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, - 'street0_SqueezeChance': False, + 'street0_SqueezeChance': True, 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, @@ -790,7 +790,7 @@ 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, - 'street0_SqueezeChance': False, + 'street0_SqueezeChance': True, 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, @@ -895,7 +895,7 @@ 'street0_FoldTo3BDone': False, 'street0_FoldTo4BChance': False, 'street0_FoldTo4BDone': False, - 'street0_SqueezeChance': False, + 'street0_SqueezeChance': True, 'street0_SqueezeDone': False, 'street1Aggr': False, 'street1Bets': 0, @@ -942,4 +942,4 @@ 'wonWhenSeenStreet1': 1.0, 'wonWhenSeenStreet2': 1.0, 'wonWhenSeenStreet3': 1.0, - 'wonWhenSeenStreet4': 0.0}} \ No newline at end of file + 'wonWhenSeenStreet4': 0.0}} From 302af8eae9e4f6202219aa693f7ffe8f6bb6e441 Mon Sep 17 00:00:00 2001 From: Worros Date: Tue, 1 Mar 2011 16:13:58 +0800 Subject: [PATCH 8/8] Hand.select(): Minor update - Fix query after schema change. - Convert code attempting to use row_factory to a slower equivalent --- pyfpdb/Hand.py | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index f489f99f..792e3d93 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -359,11 +359,17 @@ db: a connected Database object""" # NOTE: This relies on row_factory = sqlite3.Row (set in connect() params) # Need to find MySQL and Postgres equivalents # MySQL maybe: cursorclass=MySQLdb.cursors.DictCursor - res = c.fetchone() + #res = c.fetchone() + + # Using row_factory is global, and affects the rest of fpdb. The following 2 line achieves + # a similar result + res = [dict(line) for line in [zip([ column[0] for column in c.description], row) for row in c.fetchall()]] + res = res[0] #res['tourneyId'] #res['seats'] #res['rush'] self.tablename = res['tableName'] self.handid = res['siteHandNo'] + #print "DBEUG: res['startTime']: %s" % res['startTime'] self.startTime = datetime.datetime.strptime(res['startTime'], "%Y-%m-%d %H:%M:%S+00:00") self.maxseats = res['maxSeats'] @@ -396,16 +402,19 @@ db: a connected Database object""" Players as p, Hands as h WHERE - h.id = %s - and ha.handsPlayerId = hp.id - and hp.playerId = p.id + h.id = %s + AND ha.handId = h.id + AND ha.playerId = hp.playerid + AND hp.playerId = p.id AND h.id = hp.handId ORDER BY ha.id ASC -; """ +""" + q = q.replace('%s', db.sql.query['placeholder']) c.execute(q, (handId,)) - for row in c.fetchall(): + res = [dict(line) for line in [zip([ column[0] for column in c.description], row) for row in c.fetchall()]] + for row in res: name = row['name'] street = row['street'] act = row['actionId'] @@ -414,7 +423,6 @@ db: a connected Database object""" street = self.allStreets[int(street)+1] #print "DEBUG: name: '%s' street: '%s' act: '%s' bet: '%s'" %(name, street, act, bet) if act == 2: # Small Blind - print "DEBUG: addBlind(%s, 'small blind', %s" %(name, str(bet)) self.addBlind(name, 'small blind', str(bet)) elif act == 4: # Big Blind self.addBlind(name, 'big blind', str(bet)) @@ -426,6 +434,8 @@ db: a connected Database object""" self.addFold(street, name) elif act == 11: # Check self.addCheck(street, name) + elif act == 7: # Raise + self.addRaiseBy(street, name, str(bet)) else: print "DEBUG: unknown action: '%s'" % act