From 7d05455296765d8139e4d16302f9a70be8df873c Mon Sep 17 00:00:00 2001 From: Worros Date: Sun, 27 Feb 2011 20:52:17 +0800 Subject: [PATCH 01/19] 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 02/19] 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 a6024e2859af019dc77f1b6331ebef0507dce344 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Sun, 27 Feb 2011 17:33:05 -0500 Subject: [PATCH 03/19] enable WAL in sqlite --- pyfpdb/Database.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index 6694b562..b2a4347c 100644 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -464,6 +464,7 @@ class Database: log.warning(_("Some database functions will not work without NumPy support")) self.cursor = self.connection.cursor() self.cursor.execute('PRAGMA temp_store=2') # use memory for temp tables/indexes + self.cursor.execute('PRAGMA journal_mode=WAL') # use memory for temp tables/indexes self.cursor.execute('PRAGMA synchronous=0') # don't wait for file writes to finish else: raise FpdbError("sqlite database "+database+" does not exist") From 9b1d4a36b33366b26e7ae76aa36769107670d9de Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Mon, 28 Feb 2011 03:13:06 +0100 Subject: [PATCH 04/19] turn PKR off by default as its pretty borked --- pyfpdb/HUD_config.xml.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example index 93a499da..20b0234a 100644 --- a/pyfpdb/HUD_config.xml.example +++ b/pyfpdb/HUD_config.xml.example @@ -542,7 +542,7 @@ Left-Drag to Move" - + From c6926b6619b097afdaedfd20a6beb76f865612bd Mon Sep 17 00:00:00 2001 From: Worros Date: Mon, 28 Feb 2011 12:30:25 +0800 Subject: [PATCH 05/19] 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 06/19] 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 07/19] 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 08/19] 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 09/19] 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 10/19] 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 From 20243ac6ed8d365f905a374fc516e419d1cfeb8c Mon Sep 17 00:00:00 2001 From: Eratosthenes Date: Tue, 1 Mar 2011 12:22:48 -0500 Subject: [PATCH 11/19] Fix problem with missing tables or unfound tables. --- pyfpdb/HUD_main.pyw | 2 +- pyfpdb/TableWindow.py | 6 +++++- pyfpdb/XTables.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pyfpdb/HUD_main.pyw b/pyfpdb/HUD_main.pyw index 04476dae..e4d86670 100755 --- a/pyfpdb/HUD_main.pyw +++ b/pyfpdb/HUD_main.pyw @@ -266,7 +266,7 @@ class HUD_main(object): cards = self.get_cards(new_hand_id) table_kwargs = dict(table_name=table_name, tournament=tour_number, table_number=tab_number) tablewindow = Tables.Table(self.config, site_name, **table_kwargs) - if tablewindow is None: + if tablewindow.number is None: # If no client window is found on the screen, complain and continue if type == "tour": table_name = "%s %s" % (tour_number, tab_number) diff --git a/pyfpdb/TableWindow.py b/pyfpdb/TableWindow.py index 72151d13..5d69687f 100644 --- a/pyfpdb/TableWindow.py +++ b/pyfpdb/TableWindow.py @@ -34,9 +34,13 @@ import gtk import gobject # FreePokerTools modules +import Configuration from HandHistoryConverter import getTableTitleRe from HandHistoryConverter import getTableNoRe +c = Configuration.Config() +log = Configuration.get_logger("logging.conf", "hud", log_dir=c.dir_log, log_file='HUD-log.txt') + # Global used for figuring out the current game being played from the title. # The dict key is a tuple of (limit type, category) for the game. # The list is the names for those games used by the supported poker sites @@ -142,7 +146,7 @@ class Table_Window(object): if self.number is not None: break trys += 1 if trys > 4: - log.error(_("Can't find table %s") % table_name) + log.error("Can't find table %s" % table_name) return None geo = self.get_geometry() diff --git a/pyfpdb/XTables.py b/pyfpdb/XTables.py index 10278a05..93664856 100644 --- a/pyfpdb/XTables.py +++ b/pyfpdb/XTables.py @@ -128,7 +128,7 @@ class Table(Table_Window): des_re = 'No such window with id' listing = os.popen("xwininfo -id %d -stats" % (self.number)).read() - + if listing == "": return mo = re.search(des_re, listing) if mo is not None: return None # table has been destroyed From 9a7d148cf218f76ba7bf9cf61ebf73e79ce3b878 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Tue, 1 Mar 2011 22:44:13 +0100 Subject: [PATCH 12/19] allow . in ongame table names --- pyfpdb/OnGameToFpdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/OnGameToFpdb.py b/pyfpdb/OnGameToFpdb.py index a7423c00..15bb1a35 100755 --- a/pyfpdb/OnGameToFpdb.py +++ b/pyfpdb/OnGameToFpdb.py @@ -73,7 +73,7 @@ class OnGame(HandHistoryConverter): re_HandInfo = re.compile(u""" \*\*\*\*\*\sHistory\sfor\shand\s(?P[-A-Z\d]+).* Start\shand:\s(?P.*) - Table:\s(\[SPEED\]\s)?(?P[-\'\w\s]+)\s\[\d+\]\s\( + Table:\s(\[SPEED\]\s)?(?P
[-\'\w\s\.]+)\s\[\d+\]\s\( ( (?PNO_LIMIT|Limit|LIMIT|Pot\sLimit|POT_LIMIT)\s (?PTEXAS_HOLDEM|OMAHA_HI|SEVEN_CARD_STUD|SEVEN_CARD_STUD_HI_LO|RAZZ|FIVE_CARD_DRAW)\s From 9fadd7b81c2a4aec561b4958f312ed0068f49bff Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Tue, 1 Mar 2011 22:50:44 +0100 Subject: [PATCH 13/19] minor update to l10n files --- pyfpdb/locale/de/LC_MESSAGES/fpdb.mo | Bin 20591 -> 20366 bytes pyfpdb/locale/es/LC_MESSAGES/fpdb.mo | Bin 11947 -> 11947 bytes pyfpdb/locale/fpdb-de_DE.po | 7 ++++--- pyfpdb/locale/fpdb-en_GB.pot | 4 ++-- pyfpdb/locale/fpdb-es_ES.po | 4 ++-- pyfpdb/locale/fpdb-fr_FR.po | 4 ++-- pyfpdb/locale/fpdb-hu_HU.po | 5 +++-- pyfpdb/locale/fr/LC_MESSAGES/fpdb.mo | Bin 29028 -> 29028 bytes pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo | Bin 76240 -> 76484 bytes 9 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pyfpdb/locale/de/LC_MESSAGES/fpdb.mo b/pyfpdb/locale/de/LC_MESSAGES/fpdb.mo index 7f555b33e19c7fd431dc9077a4c1dab9c0d97182..aef2f47293bb467ea70504bfd977e8979e4283a0 100644 GIT binary patch delta 3687 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 delta 18 acmZ1-yE=Bm9Vu1=Q!7)$%@3tc2?GF0!3RtL diff --git a/pyfpdb/locale/fpdb-de_DE.po b/pyfpdb/locale/fpdb-de_DE.po index ad00171c..0f005f9c 100644 --- a/pyfpdb/locale/fpdb-de_DE.po +++ b/pyfpdb/locale/fpdb-de_DE.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.20.905 plus git\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: 2010-08-30 00:57+0200\n" "Last-Translator: Steffen Schaumburg \n" "Language-Team: Fpdb\n" @@ -3099,7 +3099,7 @@ msgstr "" #: fpdb.pyw:38 msgid " - press return to continue\n" -msgstr " - drücken Sie Enter um fortzufahren" +msgstr " - drücken Sie Enter um fortzufahren\n" #: fpdb.pyw:45 msgid "" @@ -3133,8 +3133,9 @@ msgid "GuiStove not found. If you want to use it please install pypoker-eval." msgstr "" #: fpdb.pyw:244 +#, fuzzy msgid "" -"Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " +"Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " "sqlcoder, Bostik, and others" msgstr "" "Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " diff --git a/pyfpdb/locale/fpdb-en_GB.pot b/pyfpdb/locale/fpdb-en_GB.pot index 38892076..6b69504c 100644 --- a/pyfpdb/locale/fpdb-en_GB.pot +++ b/pyfpdb/locale/fpdb-en_GB.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2990,7 +2990,7 @@ msgid "GuiStove not found. If you want to use it please install pypoker-eval." msgstr "" #: fpdb.pyw:244 -msgid "Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, sqlcoder, Bostik, and others" +msgid "Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, sqlcoder, Bostik, and others" msgstr "" #: fpdb.pyw:245 diff --git a/pyfpdb/locale/fpdb-es_ES.po b/pyfpdb/locale/fpdb-es_ES.po index 3a83424a..23f94404 100644 --- a/pyfpdb/locale/fpdb-es_ES.po +++ b/pyfpdb/locale/fpdb-es_ES.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: fpdb\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: \n" "Last-Translator: Javier Sánchez \n" "Language-Team: \n" @@ -3042,7 +3042,7 @@ msgstr "" #: fpdb.pyw:244 msgid "" -"Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " +"Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " "sqlcoder, Bostik, and others" msgstr "" diff --git a/pyfpdb/locale/fpdb-fr_FR.po b/pyfpdb/locale/fpdb-fr_FR.po index b6b808c2..5ba22736 100644 --- a/pyfpdb/locale/fpdb-fr_FR.po +++ b/pyfpdb/locale/fpdb-fr_FR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: 2010-09-09 13:33+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -3195,7 +3195,7 @@ msgstr "" #: fpdb.pyw:244 msgid "" -"Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " +"Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " "sqlcoder, Bostik, and others" msgstr "" diff --git a/pyfpdb/locale/fpdb-hu_HU.po b/pyfpdb/locale/fpdb-hu_HU.po index 5487262f..2d3f3aea 100644 --- a/pyfpdb/locale/fpdb-hu_HU.po +++ b/pyfpdb/locale/fpdb-hu_HU.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.20.905 plus git\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: 2011-02-27 18:23+0100\n" "Last-Translator: Ferenc Erki \n" "Language-Team: Hungarian \n" @@ -3183,8 +3183,9 @@ msgstr "" "eval-t." #: fpdb.pyw:244 +#, fuzzy msgid "" -"Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " +"Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " "sqlcoder, Bostik, and others" msgstr "" "Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " diff --git a/pyfpdb/locale/fr/LC_MESSAGES/fpdb.mo b/pyfpdb/locale/fr/LC_MESSAGES/fpdb.mo index 2ca10d4f1bd814a68fac0846b35248156dd404e0..e75ed7d50a39b80c244380be9c3286770f39ad26 100644 GIT binary patch delta 20 bcmaFzi1EoI#tkNptVYIGrskV19kmSrU5*D# delta 20 bcmaFzi1EoI#tkNptOll5riPm>9kmSrU1$eJ diff --git a/pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo b/pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo index f60e6655ac71ddc2d07d0db119fa929d2cb14cff..80056f1201355a41c3d66bfdfc1d88672091e95a 100644 GIT binary patch delta 14385 zcmajld3aCPzQ^$$fOH~b>v^7(Q`~GCD=ef`Q>z?P{`&!?%_g=$y4L_WF>`U)`UwgY} zLcA9^{AWl-$BDwwNJanqAOBX46F?Y%ff$KRuo1>#KWv7s^?ghvK8O5|6P)5WVVH&b zZV1-IS=f`$oYfQ}sJM+aFr>BP)WL?>6tge}pTh3A2p_@A*c_8n&3E~z0Zm1H|1JjO zJ`Bfi(1TYn8iUdt$Cv({1PYpYYt(~2SQ|^wALn9KeA~vQ=tH~}t6&-W;-{#YoIO z_W2dm04jGd8Loxe#0^nPo6^BGA9SL^kBWY%7oNZdScK|eF=pd>tdDn49YtptldPSr z{ZM;g6l&npQJZrC7U4&z)6mTA=s0yL3_^7{9o6t!RO)wNS3HE;BjFF38O5RomWrBr zSJZa{(Su`A8Juk`MJ>^OROZg2_KKnWlQGQN2z9R8pJAC=O{sLaenHM|U!!YwvFhVjI|U`4F{uo+l5>brWV z0j6L&c0_$Y4ZU#@`qRI&j6xcgqGomhHITni$HqI0<-thQhtXIG>!B{5cpE39zE4GE ztTXyxZ&Z7OP!k)6`ffV9`rs7`jqy#?i1%O>JdDcB*VaqcJE-I1*Tq;9wK-$a2a{15 zXoK2pIXE6iU@V@pa*w;^DQWPC89)bY!3zag8&@KCjq?d=p#R1C=-bt-X#zGN9*XsF z2C{ve^~iy7{z45Pxtlpr5 zOvaO_r3-k}+-zB>b3Yu_(G=AC3s3{!fNJkJ>b+lG3TjwCZTg@lYORuOoQb+2b1@K~ zK`qTJ>wMH+Sc-M<9rWNH)OY7G5g%Z4Ow2JE8-|>G$DK(*Gd_%3yW6NW_v&Hp@am|w zY=+ga6KV#1P#GJGTB?PpfqaO;xYK$VClH@S4X{s7^D8?6{pjDBPeBc@z!2Po>R=xR z;SWfboj;ICIO)C2F?tofiC3dCQ;Gq&9hLHfn1E+c6AS2VG8cyY+&Izbt@A&K!fYyr zVG>@&>R7*z8CYvH46)dk%FWtwVLZ5yNpW`r~O- z1}>wknZ^w;$0HqIBOZ*c@po*6v5%R|JdV-CucHRK5m^;y4_3t*1I-e6P)m}49k4C> z;xyFvFQe{(wFAk&QhS(+TKEq(!?4HAd4Jg23-x>mM&J}&&*INVt^}t;uF1@+s9n7g zwHg0L?i%M7HpYx$TuL|wTVUxh@~;lhQlU*!?Fq99BTyr5f|aoqhGAROChKkEVHiw2 z8TH<)sPE?DP+W?6_+QM#Cx)8=m!kT+;Zk5C&VB5N6?t1D%fvK%8ntFyPz~?Jx_B5h zqrXt6Br4wwtO5_5#+o& zIjBAJxP3kjwYg?tJid#1?+9vQr*IUW#qxGWm|w#jWY4(HEDCyYAu6>?QFneR#^Pnv z9tj+2Qq~65P-pbTuC~4ps^h_!j-yb!d<_o43#iT7nbD-+B8=1dKSn_*yp7tmKBLV{ z!m$x?2I_eMG6`oY`r^;1rMZHS;6JGMG7HRU=!?p1E=J)L?1T$Z1N$Byrhg}L44vQ; z*bP@>1-y#t=mx%r4=@1V8*6T|U8qd#!x;SB*8h(F#MiA}g=Rp37)X5tYQPQAtxTbq zg4T2j2I1@IgUeAJtVO-I5&iH3tcqo*&2|VifitL%J>$$p)D*Lbd!uH&3@hUIsP=yx zNB*_;zfhruuAt7h*LZW@BT<=Xg-T&6HpIRdi7x6&U4lBE+ff-hhE?zk2IEE4Zoh5g z@FMf87+*yGtMOm}73yFV>Vp|r2Nz>g+>Swb3G3l4)IcMP%^J5veg7zGV56}*&cG(P z1eN+vF%G{)UCj?%3OYVDO3VjMQ5nfVZeJ%8HGmbU({Kbc@j6b$^ag*Tm|mHEe=W*b$YPA*dyI9+k-js8jTobp@)OHCR>W|34Js@gvkGxrEBdO;iV= z&zQArglf1g*2V6qhKo>3FbVbjbgYfDF$_1N2C@(J{b#5pIgPGT8!*jWG#yZT;Sp4W z*{GEDL3K13)zEO%8jrN~W3c=lLEQ^eusXhoYG*Nq;7ZhH{J^?z8u`}@zoJ6t_E*&I zzKvRv_M}Gx7=U`NpKCQZ4mHzB7>+Yg9lnj4;bt4}M=jk+8(*}~@1h3cKb?X`9yQ&} ztRCuvhN$|Mn2v3*4o*TnUxaF4H8#T!u{K^r9aHaT&G(H^n>h)U!F<$r1=t;@x)ikb zU!ZpLO;idKo--Y#qCUt({TB4K^+Qn^8DpP6jr#6Y`}|ECud>hILuKe=48;=|h3+K^ znvwVOrlVj~N@FkvQ&AlcL@h-gHo&pSfp8WeC(j9f!EClyaT4)6sP7_QG=JcT#c1M8 zWM4aZSW)NyCkh(CMbsv_hFbf|FPYx}5B4NZM;)8jQK^0lwHLOb_Cguf!lPKemoSa^ zHmd#P8RoqXsEl?;{ri(MghB@@mZR44ENYimd)a(g11l5P#ZDNHO>r!0ZI@yp9!Cv4 zW2VW_K#U`P&RU8d;uBa8uVEJbJK?XG)C|Q|#4aY_7S#E@fXd80)TRk~m7|D5P;2=y zR>3c^KAuK(;LI`|)<+-0&Zs@`DCzq9?0sMq& zu=(rexTRxN;%r=t{ZZ}euT{#3$C`$L#J!QVcb=F{{);I*Nku%KM%@RM=CIQ-5?f*s zYDxZu8t6v!$35taM^OVhi9z@iDkE1>_rYDPg#K@s`VjOZuJs1_*QRMeg;Je?0oWh) zK|U&F1vZ|J>gXlZOlI5q<*0$Zi)wf~HpTs@_pf0yyobt6)43)C*)9d8t_Ny{kE7Nw z7d3;IPz}G1iMYzve~CJ#r%@eUL!IZCc_!uUFp0Q7YGSWoU0jKp;6BuGbWc#wX89X6 zqZ;$g64b{8;xw#|Be5MmgBsv2)RLV;U0i+(%yD}NGl-|5IxIs?@I2}!y@Hx(qc_V3 z=sJlMv;?_W1E->9HWx#%6t&hLq2Bu(mEsFF{u>(*`!6&ZNJeeC9Ms+zh1wG(sPA9E zID8v}b^Z@h@KA9QTjE`7vqh%id{nAlLuFzEDurdJj*eh!yo{+Bv)HWlKvexK^x%G+ zh!;^A8vGU+rhjJz1 Dg$RR6>p#i6PK7J%E4gb5{$%`Py>1gHNY*{5x+*YQ*)^~ z=Lx7Kdl)tI0&IcvvHaivKck>jpF<7gIx6Mf%go<^f>Eh#gH13K)j=_Oa3*TNrKk-4 zY^}B2WGV;4sUM7C_!QQ}*Ort22nuU#MVa-a^(yMP_`Pj@RvTj|aSzm$oR8IT3~E5r zP@8!^YV&SGb#w_Ep|ipaq%lSjKD5F$e~lhWh0f_LjKKxi4!5G#@Fr@8i7U-+ABoy@ zD^VSMiZi{)AZkLRSD7Vx5u58hROY_I6!d!6{N|*(6f&rof_iZm*1|tgYgBc$8Blv1 zMx2Z4U>|Dj&tQGLifI_W#!RRuP9UC!1$Z6PF?X%`eiVAsmVr7Xb7s^7qK4wJ8LP_q2ds# zqu;ERH<;ZWgKD@VYLn$#r=oWAT-5GfhdMpGQ5iap{&)p-U;Kl5?z_?S6M@0>@3gQL znWz-!q6a6S*7i+oh&!!6qpsF~_sk}2hK-2(S)W4dazsD>AymZ%IH<5|>ue(#%s#bZB;QHo&{6%*AXnrdYE# zk$-*g1QkIz$v$`)HRI)2ga=WlA?-hA*A}7%xC)iA!>D%7;Sjuu0oZr5S)$=sjreKQ z`?GBQ3jIYvn_?>!n%NH+hrS<}HBUkfq!0SyGz`I)txK%$p^ouxtcn#sGzMBDto5yl z)-=}^I$LwB1FiYi@z$x<8CaQ)=Avf07&Wl9sHNP2mGEl}#M7vO{fd5g1GR*%*B0}m zQ3pFvF${G>twLqwG-?x7*=kZ)4}*zYpgPRNFdTq7CF4*ToR9i`m-R9x5QlCvzyA** zOX50N6x84V)Cfmo7CwbKr=OrVoYRbp97ps7b{-`@$X@A4JXUM^wkRQ0KYQ4m!aQ)BuKC$6+|}R8$A^u@Ho@jthOO`#D#eX4WU8sGt3gm+L& zHn+@dt`AU|J%RfEH_XB2yUiYXemD8ojMh_82ajST{)tV{Z;!cnTBGXwq0W6V*2QJ0 zl$Y7~JB%Uz2diW4z2;s?LJd3vt6(ow`vdp7=KQ}*g&KMfmBItq9=-ONlxJXX;yl#u z-hn>&6KXAgLp690HRJgGX76;w2E+qU8Jlk1gc`_CE(L9tUr__NgR?RCfLVf-)-O>V zRyt^A7Kqw2by1mVgPLJ~%*RnU0*_-frhRJeg8`@k4nZAXcap7m6%(m=7qxl5LN)j+ zYV+Jf-GEu2F?;NZZ86|;a|*hm-tULWI1*>#GHi))hfJmiVJG6}@iCqMPbp|O*89Sw zb`a{=y@<7ODTd+>Y>Y>-1^$D2ui0VqN41Bs3-L=BkH@ez-bJ;ae8gOIV=#mGeQc@o zf0cqa6%CJ?j+$CKTKi!yo)=(KEW;$cf|Jp6%w*^-9722%2Vv%M)A75g%$&g-{0oCH z;{@5Gf2RiprF;l>#0gjxx1o0PUewGlU=jv@X$JBTCK8Xw09=X6$iGn?9|T zPi6+`)+|h=z7J}NW}{BWZe+=wo2Yi~p_aJHc~c*RKE!Sf3Y{rLV_zJO6LBYY#pIvO zu6D5=@mbWGSG-^@k}zyToQRrH0ctO-#$x;smGbzDroI*SAkIWG?K+Dn1X8g9)xl0| zfM;EC&sLMvQ_TI*A&6t()@{3FrJ=u12cz41*{#+G0LmSPm1#EN(mo8Vp4UWog{Y}Ut7 zGoOPV{19F3#&0N8#p|dUJ-|4udByz9c0jH16R0Ixf!cKYunykGrWpOFS(0w33vE7X zVx_2l&S5M*K%J`CzsSED>id^DCUdYk@p|;fGdBJWHN)t?jp?X?_D5xAJWjx;QK|hK z)p6QY^Rqo3=MW#jMC^Bse+9)E*T}y%$v0HUUojBxV+aOZH@nt@6^NTzlQD_76>0z@ zFcgbW8JdCJa6Pub+ZcvTZ~Ht7yj1N$)o?_ymHy=QiJ3Mzgawdq{cz?Y%g`x4duN%YtGzd%82c@;yk{(sF{ zrD84O98AU0sE${o26_s$C(ffXbG|ecG~*t4@`!dpfZz!Iz>HDduT9fljo!Efhp+foWD&$sXd6A z*$E88)7Gn~)8OlPl{XlLnn^rrz=^01T45J#hcWmvR>M-%_d8KbaRk+`x0jb&zFV7k zd6jqE4~Oz#C~7n9MrGhQX5o+64&y6$m0w6BP;0pw18@^+hM(B@OY1r7pZ58GQ3DFD z=$aYTuV^|-LZz+)*2c%IlTayp6E(1%sJ(FrHPegO5PiH&dr8)I*ns-3I2DVqKmLj8 zC(Etm<;TEB zd=vGZ<6|b|R;Qp{-x{@c*{B&VM5TVMjkjQL;sZDkBYnNfuj+}Yft8}Z+k{$@-8cvj zV`pq!)vNrT8INxge}ZI?fB*CIDnDN1QJZ5uw#ReW1Y`Wo3?D@`ScnOD7(3xTY=s#C zUga0fB-G|zh{NzbT!6uWUgh_~TGT*4NB#ewI;SXPP!StsI(`y$A+1HN@pkm!SEvEq zKxM3MHS;_LHK3k24WGr$=mdL}{~`4Q)aeQgG2ca?GMj*9^zXE#pdXFxzB z=z{vN1ijHk?Uff$YaJeHW}1qH#5tIbWvFw14>eHV8fMQ#qn4%#YROuotBa()eb5KB zIdW0wxdgS@rlKt8sI?!89dIIQ0NYSE>V9mCXRtm- z)#Uu^$0DPq*#pB-BU^*oj2~kiypH-HG{TsQn)zTs2Nv`_A39gTR3JCXJPrwF`oEa z)OTKW%<1r;E}(SOUh9WivN4#g^Iu9Kjf&gY5tBXUxIKl%#0&8u^oucT+8woL=Abh1 zHY$T3VFCu$HTOYV)bkQl>gS@C_5;*}zrema|2OOl-RhYa$D-DB4(i2?*a^QuH5ggn zn2JhyKWhPMBF~~W=PuMtKSgDrQmi@VF{q4o#%!Jc85FwW*QlE*rh)k&33VT2V=R`~ z_$?dnwq8Qr9|3V@0!gT)=!Lq#oAiWwC;h8=jow`8*vJ~LoyVhjV?4zpN9Pso-BnQH$^Adm@C?f< z*}J8nWbeA-Jf_rj@4BLbywRSLyn?)OdpDL84`+H~^TwwA|8sJ>lqYHL$^u4M9&Da` u;h7e7GRF-cmXljloL4>?x{r%3j`QU2T{)^?EHBUddw%HFn-N~8g8l~^@r9rO delta 14218 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 BN-+Qc From 271a9d0eeb13cf0f4a7ea506b0d12b00232ee192 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Tue, 1 Mar 2011 22:53:56 +0100 Subject: [PATCH 14/19] remove duplicate statement --- pyfpdb/Filters.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py index f19774c7..182f8c58 100644 --- a/pyfpdb/Filters.py +++ b/pyfpdb/Filters.py @@ -160,7 +160,6 @@ class Filters(threading.Thread): self.types = {} # list of all ring/tour values self.num_limit_types = 0 - self.num_limit_types = 0 self.fillLimitsFrame(vbox, self.display) limitsFrame.add(vbox) From 320c856d9eb55dc3e027951d4fded3f309f0f6f3 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Tue, 1 Mar 2011 22:58:23 +0100 Subject: [PATCH 15/19] l10nify a string --- pyfpdb/TableWindow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/TableWindow.py b/pyfpdb/TableWindow.py index 5d69687f..c09ad40f 100644 --- a/pyfpdb/TableWindow.py +++ b/pyfpdb/TableWindow.py @@ -146,7 +146,7 @@ class Table_Window(object): if self.number is not None: break trys += 1 if trys > 4: - log.error("Can't find table %s" % table_name) + log.error(_("Can't find table %s") % table_name) return None geo = self.get_geometry() From 710fd8dde2e874590e37bd4f0b1adefdea691a40 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Wed, 2 Mar 2011 02:55:52 +0100 Subject: [PATCH 16/19] a couple of string corrections --- pyfpdb/Configuration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index 365f7c4a..e0e945fb 100644 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -163,8 +163,8 @@ def get_logger(file_name, config = "config", fallback = False, log_dir=None, log log = logging.basicConfig(filename=file, level=logging.INFO) log = logging.getLogger() # but it looks like default is no output :-( maybe because all the calls name a module? - log.debug(_("Default logger initialised for ")+file) - print _("Default logger intialised for ")+file + log.debug(_("Default logger initialised for %s") % file) + print(_("Default logger initialised for %s") % file) return log def check_dir(path, create = True): From 90e26bc7c24ec048129621cedea3bbadf9049b8d Mon Sep 17 00:00:00 2001 From: Worros Date: Wed, 2 Mar 2011 10:11:35 +0800 Subject: [PATCH 17/19] Party: Possible fix for freeroll tourneys --- pyfpdb/PartyPokerToFpdb.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py index 65b6f0aa..2abd744c 100755 --- a/pyfpdb/PartyPokerToFpdb.py +++ b/pyfpdb/PartyPokerToFpdb.py @@ -330,6 +330,12 @@ class PartyPoker(HandHistoryConverter): # FIXME: there is no such property in Hand class self.isSNG = True if key == 'BUYIN': + if info[key] == None: + # Freeroll tourney + hand.buyin = 0 + hand.fee = 0 + hand.buyinCurrency = "FREE" + hand.isKO = False if hand.tourNo != None: hand.buyin = 0 hand.fee = 0 From e88fb251380cd06dfaac9236cbd4b5a051009c1a Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Wed, 2 Mar 2011 03:15:15 +0100 Subject: [PATCH 18/19] string change --- pyfpdb/Configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index e0e945fb..e350b49b 100644 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -834,7 +834,7 @@ class Config: try: example_doc = xml.dom.minidom.parse(example_file) except: - log.error(_("Error parsing example file %s. See error log file.") % (example_file)) + log.error(_("Error parsing example configuration file %s. See error log file.") % (example_file)) return nodes_added for cnode in doc.getElementsByTagName("FreePokerToolsConfig"): From c03d050337fd7195ba089aca3441e310491db7fc Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Wed, 2 Mar 2011 07:03:09 +0100 Subject: [PATCH 19/19] string consistency fixes --- pyfpdb/Database.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index b2a4347c..9812300b 100644 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -1169,7 +1169,7 @@ class Database: for idx in self.indexes[self.backend]: if idx['drop'] == 1: if self.backend == self.MYSQL_INNODB: - print _("Creating mysql index %s %s") % (idx['tab'], idx['col']) + print _("Creating MySQL index %s %s") % (idx['tab'], idx['col']) try: s = "alter table %s add index %s(%s)" % (idx['tab'],idx['col'],idx['col']) c.execute(s) @@ -1178,7 +1178,7 @@ class Database: elif self.backend == self.PGSQL: # pass # mod to use tab_col for index name? - print _("Creating pg index "), idx['tab'], idx['col'] + print _("Creating PostgreSQL index "), idx['tab'], idx['col'] try: s = "create index %s_%s_idx on %s(%s)" % (idx['tab'], idx['col'], idx['tab'], idx['col']) c.execute(s) @@ -1423,22 +1423,22 @@ class Database: if cons: pass else: - print _("creating foreign key "), fk['fktab'], fk['fkcol'], "->", fk['rtab'], fk['rcol'] + print _("Creating foreign key "), fk['fktab'], fk['fkcol'], "->", fk['rtab'], fk['rcol'] try: c.execute("alter table " + fk['fktab'] + " add foreign key (" + fk['fkcol'] + ") references " + fk['rtab'] + "(" + fk['rcol'] + ")") except: - print _(" create foreign key failed: ") + str(sys.exc_info()) + print _("Create foreign key failed: ") + str(sys.exc_info()) elif self.backend == self.PGSQL: - print _("creating foreign key "), fk['fktab'], fk['fkcol'], "->", fk['rtab'], fk['rcol'] + print _("Creating foreign key "), fk['fktab'], fk['fkcol'], "->", fk['rtab'], fk['rcol'] try: c.execute("alter table " + fk['fktab'] + " add constraint " + fk['fktab'] + '_' + fk['fkcol'] + '_fkey' + " foreign key (" + fk['fkcol'] + ") references " + fk['rtab'] + "(" + fk['rcol'] + ")") except: - print _(" create foreign key failed: ") + str(sys.exc_info()) + print _("Create foreign key failed: ") + str(sys.exc_info()) else: print _("Only MySQL and Postgres supported so far")