Merge branch 'master' of git://git.assembla.com/fpdb

packaging/debian/changelog

@@ -1,3 +1,16 @@
+free-poker-tools (0.20.906-1) unstable; urgency=low
+
+  * New snapshot
+
+ -- Mika Bostrom <bostik@iki.fi>  Fri, 27 Aug 2010 08:26:05 +0300
+
+free-poker-tools (0.20.905-1) unstable; urgency=low
+
+  * New snapshot
+  * Hungarian translation
+
+ -- Mika Bostrom <bostik@iki.fi>  Wed, 25 Aug 2010 10:05:36 +0300
+
 free-poker-tools (0.20.904-2) unstable; urgency=low
 
   * On fpdb start, copy example HUD_config.xml in place if none is present

packaging/debian/rules

@@ -26,8 +26,7 @@ install: build
 	# Copy *.pyw manually in packaging tree
 	cp pyfpdb/*.pyw debian/$(PACKAGE)/usr/lib/python2.6/site-packages/fpdb/
 	# Remove scripts that are only useful in win32
-	rm debian/$(PACKAGE)/usr/lib/python2.6/site-packages/fpdb//windows_make_bats.py
+	rm debian/$(PACKAGE)/usr/lib/python2.6/site-packages/fpdb/windows_make_bats.py
-	rm debian/$(PACKAGE)/usr/lib/python2.6/site-packages/fpdb/py2exe_setup.py
 
 
 binary-indep: build install

packaging/gentoo/ChangeLog

@@ -2,6 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 # created by Steffen Schaumburg, steffen@schaumburger.info
 
+  29 Aug 2010; Erki Ferenc <erkiferenc@gmail.com>
+  fpdb-0.20.906.ebuild, fpdb-9999.ebuild:
+  improve l10n handling
+
+  29 Aug 2010; Steffen Schaumburg <steffen@schaumburger.info>
+  fpdb-0.20.1.ebuild, fpdb-0.20.906.ebuild, fpdb-9999.ebuild:
+  change required python version to 2.6
+
+*fpdb-0.20.906 (29 Aug 2010)
+  29 Aug 2010; Steffen Schaumburg <steffen@schaumburger.info>
+  +fpdb-0.20.906.ebuild -fpdb-0.20.904.ebuild:
+  Bump version
+
 *fpdb-0.20.1 fpdb-0.20.904 fpdb-9999 (17 Aug 2010)
 
   17 Aug 2010; Steffen Schaumburg <steffen@schaumburger.info>

packaging/gentoo/Manifest

@@ -1,7 +1,7 @@
 DIST fpdb-0.20.1.tar.bz2 662807 RMD160 b5f22a684c605ddbba7d2154005a822b02a19490 SHA1 e4cc40de5849d3ae33a680d917b340ab37c6448b SHA256 46eff0625f300c070ce88c519ae6019f6e1c98a7725733c5e16b50a058247fe3
-DIST fpdb-0.20.904.tar.bz2 632871 RMD160 6af83a9b30e8b3f394b011a4dc92937f130b9e15 SHA1 083c51f1627f901e24801bf6abebf1d07646bd89 SHA256 5e72055fe7ebb0c6048282f8edc972ee01be21063d6f8071abef22111f3e82f9
+DIST fpdb-0.20.906.tar.bz2 702558 RMD160 bc5d01ef4899502aea33f286ac4274ef7ef498ef SHA1 9791680d53de1b276dc0297ac43a0e11758d3e19 SHA256 9ae706d5e9c2a2ee031d2b222ba46e088993cc892fc08b5276bbfd5e44a0436b
-EBUILD fpdb-0.20.1.ebuild 1591 RMD160 56ccbca72353e56718a927178e58d148177f5846 SHA1 770df692b29b7314d70703010e1f6afac623c3f3 SHA256 e3f434df58d98760a118458166f9fdfcf3612712c78c704f089f6e8ec72bd224
+EBUILD fpdb-0.20.1.ebuild 1508 RMD160 7585cd1de73172649e182782d427a476afed4036 SHA1 3c92d6dbb868b8b4c26b75539771641087742761 SHA256 9a7d302016e4c4d6cc18af14514bd5112d18aeb7dc6390a3413e3e4cc71da6bd
-EBUILD fpdb-0.20.904.ebuild 1595 RMD160 b5cbcdb8d2984b149c833db8b6aee362168e9c7d SHA1 7151fd3cef087c38060b44adb622843a84209f33 SHA256 41c6ed71aa0ff727d670c94cc72cf595bcd038f601121e51222532df727a6d01
+EBUILD fpdb-0.20.906.ebuild 1643 RMD160 ed44ee49d715458b54edbbe054eb5c9775c6ac7a SHA1 ebd8ea291ace0671d4eb264754dfb0616373a51a SHA256 a9bdad768a0ab5ef065f3e6e2e1bd89dded6e0d3b64c4771944c4aae7d163efd
-EBUILD fpdb-9999.ebuild 1618 RMD160 843d309bbc2ccdd95dbb4b0eb08571d8e16d06ad SHA1 b1ebdbe0e40bd6c0d4ec417dd2b8a135884547a6 SHA256 72205c1f94bcf2c3f310d396928e357fabaee4861773044c1dac71f98f6596bf
+EBUILD fpdb-9999.ebuild 1685 RMD160 f06457ead33dca99c0acf830f26bbf2f8ca12cd1 SHA1 70444fa4a88439955472407ec0b072970993631a SHA256 2df59120b376bb4e5966f8a719bc881c756b3210b7a30d394ee1753efbfd706e
-MISC ChangeLog 395 RMD160 b195ccf198011356ca79b16071093c4d92e5927a SHA1 9aa56e5dc9c5d03b62fb60bc81069f3440b1f606 SHA256 b7ba8c180da0e6a405d939c4485f9c8e52fdcafb04207ef6de217a807015bd03
+MISC ChangeLog 831 RMD160 efd32886d09b0750e680716030c0034c3a280a25 SHA1 82f3eda3cd83cbba3e45d4b75593e74f3dd4f568 SHA256 d74efef05cf51ef3840ef043218c8a30c1bcccfa9d9d2e4ca1b7198ed1c91f29
 MISC metadata.xml 550 RMD160 a6fa8799f644c0882f832a12cc9e6a0f4f09ae7f SHA1 3a40c442cadb1f532e0299040c2da79e9721dd4f SHA256 b5a1c538de3786446a87479b1023cdb4f084085feb7290959619739969ce7d3b

packaging/gentoo/current_stable.ebuild

@@ -4,10 +4,7 @@
 
 EAPI="2"
 
-inherit eutils
+inherit eutils games
-inherit games
-
-NEED_PYTHON=2.5
 
 DESCRIPTION="A free/open source tracker/HUD for use with online poker"
 HOMEPAGE="http://fpdb.wiki.sourceforge.net/"
@@ -49,7 +46,7 @@ src_install() {
 	newicon gfx/fpdb-icon.png ${PN}.png
 	make_desktop_entry ${PN}
 
-	chmod +x "${D}/${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
+	fperms +x "${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
 	prepgamesdirs
 }
 

packaging/gentoo/current_testing.ebuild

@@ -4,10 +4,7 @@
 
 EAPI="2"
 
-inherit eutils
+inherit eutils games
-inherit games
-
-NEED_PYTHON=2.5
 
 DESCRIPTION="A free/open source tracker/HUD for use with online poker"
 HOMEPAGE="http://fpdb.wiki.sourceforge.net/"
@@ -18,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 #note: this should work on other architectures too, please send me your experiences
 
-IUSE="graph mysql postgres sqlite linguas_hu linguas_it"
+IUSE="graph mysql postgres sqlite linguas_hu"
 RDEPEND="
 	mysql? ( virtual/mysql
 		dev-python/mysql-python )
@@ -36,29 +33,27 @@ DEPEND="${RDEPEND}"
 
 src_install() {
 	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r gfx
+	doins -r gfx || die "failed to install gfx directory"
-	doins -r pyfpdb
+	doins -r pyfpdb || die "failed to install pyfpdb directory"
 
 	if use linguas_hu; then
-		dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/hu/LC_MESSAGES/${PN}.mo /usr/share/locale/hu/LC_MESSAGES/${PN}.mo
+		msgfmt pyfpdb/locale/fpdb-hu_HU.po -o pyfpdb/locale/hu.mo || die "failed to create hungarian mo file"
 	fi
 
-	if use linguas_it; then
+	domo pyfpdb/locale/*.mo || die "failed to install mo files"
-		dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/it/LC_MESSAGES/${PN}.mo /usr/share/locale/it/LC_MESSAGES/${PN}.mo
-	fi
 
-	doins readme.txt
+	doins readme.txt || die "failed to install readme.txt file"
 
 	exeinto "${GAMES_DATADIR}"/${PN}
-	doexe run_fpdb.py
+	doexe run_fpdb.py || die "failed to install executable run_fpdb.py"
 
 	dodir "${GAMES_BINDIR}"
-	dosym "${GAMES_DATADIR}"/${PN}/run_fpdb.py "${GAMES_BINDIR}"/${PN}
+	dosym "${GAMES_DATADIR}"/${PN}/run_fpdb.py "${GAMES_BINDIR}"/${PN}  || die "failed to create symlink for starting fpdb"
 
-	newicon gfx/fpdb-icon.png ${PN}.png
+	newicon gfx/fpdb-icon.png ${PN}.png || die "failed to install fpdb icon"
-	make_desktop_entry ${PN}
+	make_desktop_entry ${PN}  || die "failed to create desktop entry"
 
-	chmod +x "${D}/${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
+	fperms +x "${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
 	prepgamesdirs
 }
 

packaging/gentoo/dev-readme.txt

@@ -1,10 +1,5 @@
 Repoman currently gives the following errors for our ebuilds:
   ebuild.allmasked: This error can be ignored, as all our packages are supposed to be masked
-  ebuild.badheader              3
-   games-util/fpdb/fpdb-0.20.1.ebuild: Malformed CVS Header on line: 3
-   games-util/fpdb/fpdb-0.20.904.ebuild: Malformed CVS Header on line: 3
-   games-util/fpdb/fpdb-9999.ebuild: Malformed CVS Header on line: 3
-   not sure what the correct header is for a sunrise ebuild so leaving as-is for now
 
 Useful Links:
 http://overlays.gentoo.org/proj/sunrise/wiki/SunriseFaq

packaging/gentoo/fpdb-9999.ebuild

@@ -4,11 +4,7 @@
 
 EAPI="2"
 
-inherit eutils
+inherit eutils games git
-inherit games
-inherit git
-
-NEED_PYTHON=2.5
 
 DESCRIPTION="A free/open source tracker/HUD for use with online poker"
 HOMEPAGE="http://fpdb.wiki.sourceforge.net/"
@@ -17,9 +13,8 @@ EGIT_REPO_URI="git://git.assembla.com/fpdb.git"
 LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS=""
-#note: this should work on other architectures too, please send me your experiences
 
-IUSE="graph mysql postgres sqlite linguas_hu linguas_it"
+IUSE="graph mysql postgres sqlite linguas_de linguas_hu"
 RDEPEND="
 	mysql? ( virtual/mysql
 		dev-python/mysql-python )
@@ -44,14 +39,16 @@ src_install() {
 	doins -r gfx
 	doins -r pyfpdb
 
-	if use linguas_hu; then
+	if use linguas_de; then
-		dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/hu/LC_MESSAGES/${PN}.mo /usr/share/locale/hu/LC_MESSAGES/${PN}.mo
+		msgfmt pyfpdb/locale/fpdb-de_DE.po -o pyfpdb/locale/de.mo
 	fi
 
-	if use linguas_it; then
+	if use linguas_hu; then
-		dosym "${GAMES_DATADIR}"/${PN}/pyfpdb/locale/it/LC_MESSAGES/${PN}.mo /usr/share/locale/it/LC_MESSAGES/${PN}.mo
+		msgfmt pyfpdb/locale/fpdb-hu_HU.po -o pyfpdb/locale/hu.mo
 	fi
 
+	domo pyfpdb/locale/*.mo
+
 	doins readme.txt
 
 	exeinto "${GAMES_DATADIR}"/${PN}
@@ -63,7 +60,7 @@ src_install() {
 	newicon gfx/fpdb-icon.png ${PN}.png
 	make_desktop_entry ${PN}
 
-	chmod +x "${D}/${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
+	fperms +x "${GAMES_DATADIR}"/${PN}/pyfpdb/*.pyw
 	prepgamesdirs
 }
 

pyfpdb/AbsoluteToFpdb.py

@@ -164,7 +164,7 @@ class Absolute(HandHistoryConverter):
     def readHandInfo(self, hand):
         m = self.re_HandInfo.search(hand.handText)
         if(m == None):
-            logging.info("Didn't match re_HandInfo")
+            logging.info(_("Didn't match re_HandInfo"))
             logging.info(hand.handText)
             return None
         logging.debug("HID %s, Table %s" % (m.group('HID'),  m.group('TABLE')))
@@ -221,7 +221,7 @@ class Absolute(HandHistoryConverter):
         hand.setCommunityCards(street=street, cards=cards)
 
     def readAntes(self, hand):
-        logging.debug("reading antes")
+        logging.debug(_("reading antes"))
         m = self.re_Antes.finditer(hand.handText)
         for player in m:
             logging.debug("hand.addAnte(%s,%s)" %(player.group('PNAME'), player.group('ANTE')))
@@ -230,17 +230,17 @@ class Absolute(HandHistoryConverter):
     def readBringIn(self, hand):
         m = self.re_BringIn.search(hand.handText,re.DOTALL)
         if m:
-            logging.debug("Player bringing in: %s for %s" %(m.group('PNAME'),  m.group('BRINGIN')))        
+            logging.debug(_("Player bringing in: %s for %s" %(m.group('PNAME'),  m.group('BRINGIN'))))
             hand.addBringIn(m.group('PNAME'),  m.group('BRINGIN'))
         else:
-            logging.warning("No bringin found.")
+            logging.warning(_("No bringin found."))
 
     def readBlinds(self, hand):
         m = self.re_PostSB.search(hand.handText)
         if m is not None:
             hand.addBlind(m.group('PNAME'), 'small blind', m.group('SB'))
         else:
-            logging.debug("No small blind")
+            logging.debug(_("No small blind"))
             hand.addBlind(None, None, None)
         for a in self.re_PostBB.finditer(hand.handText):
             hand.addBlind(a.group('PNAME'), 'big blind', a.group('BB'))
@@ -267,7 +267,7 @@ class Absolute(HandHistoryConverter):
     
     def readStudPlayerCards(self, hand, street):
         # lol. see Plymouth.txt
-        logging.warning("Absolute readStudPlayerCards is only a stub.")
+        logging.warning(_("Absolute readStudPlayerCards is only a stub."))
         #~ if street in ('THIRD', 'FOURTH',  'FIFTH',  'SIXTH'):
             #~ hand.addPlayerCards(player = player.group('PNAME'), street = street,  closed = [],  open = [])
 
@@ -290,7 +290,7 @@ class Absolute(HandHistoryConverter):
             elif action.group('ATYPE') == ' complete to': # TODO: not supported yet ?
                 hand.addComplete( street, action.group('PNAME'), action.group('BET'))
             else:
-                logging.debug("Unimplemented readAction: %s %s" %(action.group('PNAME'),action.group('ATYPE'),))
+                logging.debug(_("Unimplemented readAction: %s %s" %(action.group('PNAME'),action.group('ATYPE'),)))
 
 
     def readShowdownActions(self, hand):
@@ -334,9 +334,9 @@ if __name__ == "__main__":
     config =  Configuration.Config(None)
 
     parser = OptionParser()
-    parser.add_option("-i", "--input", dest="ipath", help="parse input hand history", default="-")
+    parser.add_option("-i", "--input", dest="ipath", help=_("parse input hand history"), default="-")
-    parser.add_option("-o", "--output", dest="opath", help="output translation to", default="-")
+    parser.add_option("-o", "--output", dest="opath", help=_("output translation to"), default="-")
-    parser.add_option("-f", "--follow", dest="follow", help="follow (tail -f) the input", action="store_true", default=False)
+    parser.add_option("-f", "--follow", dest="follow", help=_("follow (tail -f) the input"), action="store_true", default=False)
     parser.add_option("-q", "--quiet",
                   action="store_const", const=logging.CRITICAL, dest="verbosity", default=logging.INFO)
     parser.add_option("-v", "--verbose",

pyfpdb/BetfairToFpdb.py

@@ -127,7 +127,7 @@ class Betfair(HandHistoryConverter):
 
         #Shouldn't really dip into the Hand object, but i've no idea how to tell the length of iter m
         if len(hand.players) < 2:
-            logging.info("readPlayerStacks: Less than 2 players found in a hand")
+            logging.info(_("readPlayerStacks: Less than 2 players found in a hand"))
 
     def markStreets(self, hand):
         m =  re.search(r"\*\* Dealing down cards \*\*(?P<PREFLOP>.+(?=\*\* Dealing Flop \*\*)|.+)"
@@ -164,7 +164,7 @@ class Betfair(HandHistoryConverter):
     def readBringIn(self, hand):
         m = self.re_BringIn.search(hand.handText,re.DOTALL)
         if m:
-            logging.debug("Player bringing in: %s for %s" %(m.group('PNAME'),  m.group('BRINGIN')))
+            logging.debug(_("Player bringing in: %s for %s" %(m.group('PNAME'),  m.group('BRINGIN'))))
             hand.addBringIn(m.group('PNAME'),  m.group('BRINGIN'))
         else:
             logging.warning(_("No bringin found"))

pyfpdb/CarbonToFpdb.py

@@ -148,7 +148,7 @@ or None if we fail to get the info """
     def readHandInfo(self, hand):
         m = self.re_HandInfo.search(hand.handText)
         if m is None:
-            logging.info("Didn't match re_HandInfo")
+            logging.info(_("Didn't match re_HandInfo"))
             logging.info(hand.handText)
             return None
         logging.debug("HID %s-%s, Table %s" % (m.group('HID1'),
@@ -254,8 +254,8 @@ or None if we fail to get the info """
             elif action.group('ATYPE') == 'ALL_IN':
                 hand.addAllIn(street, player, action.group('BET'))
             else:
-                logging.debug("Unimplemented readAction: %s %s"
+                logging.debug(_("Unimplemented readAction: %s %s"
-                              % (action.group('PSEAT'),action.group('ATYPE'),))
+                              % (action.group('PSEAT'),action.group('ATYPE'),)))
 
     def readShowdownActions(self, hand):
         for shows in self.re_ShowdownAction.finditer(hand.handText):
@@ -285,9 +285,9 @@ or None if we fail to get the info """
 
 if __name__ == "__main__":
     parser = OptionParser()
-    parser.add_option("-i", "--input", dest="ipath", help="parse input hand history", default="-")
+    parser.add_option("-i", "--input", dest="ipath", help=_("parse input hand history"), default="-")
-    parser.add_option("-o", "--output", dest="opath", help="output translation to", default="-")
+    parser.add_option("-o", "--output", dest="opath", help=_("output translation to"), default="-")
-    parser.add_option("-f", "--follow", dest="follow", help="follow (tail -f) the input", action="store_true", default=False)
+    parser.add_option("-f", "--follow", dest="follow", help=_("follow (tail -f) the input"), action="store_true", default=False)
     parser.add_option("-q", "--quiet", action="store_const", const=logging.CRITICAL, dest="verbosity", default=logging.INFO)
     parser.add_option("-v", "--verbose", action="store_const", const=logging.INFO, dest="verbosity")
     parser.add_option("--vv", action="store_const", const=logging.DEBUG, dest="verbosity")

pyfpdb/Configuration.py

@@ -132,8 +132,8 @@ def get_config(file_name, fallback = True):
                 print msg
                 logging.info(msg)
         except:
-            print _("Error copying .example file, cannot fall back. Exiting.\n")
+            print _("Error copying .example config file, cannot fall back. Exiting.\n")
-            sys.stderr.write(_("Error copying .example file, cannot fall back. Exiting.\n"))
+            sys.stderr.write(_("Error copying .example config file, cannot fall back. Exiting.\n"))
             sys.stderr.write( str(sys.exc_info()) )
             sys.exit()
     elif fallback:

pyfpdb/Database.py

@@ -1766,6 +1766,38 @@ class Database:
         c = self.get_cursor()
         c.executemany(q, inserts)
 
+    def storeHandsActions(self, hid, pids, adata, printdata = False):
+        #print "DEBUG: %s %s %s" %(hid, pids, adata)
+        if printdata:
+            import pprint
+            pp = pprint.PrettyPrinter(indent=4)
+            pp.pprint(adata)
+
+        #inserts = []
+        #for p in pdata:
+        #    inserts.append( (hid,
+        #                     pids[p],
+        #                     adata[p]['startCash'],
+        #                     adata[p]['seatNo'],
+        #                     adata[p]['sitout'],
+        #                     adata[p]['card1'],
+
+        #handsPlayerId BIGINT UNSIGNED NOT NULL, FOREIGN KEY (handsPlayerId) REFERENCES HandsPlayers(id),
+        #street SMALLINT NOT NULL,
+        #actionNo SMALLINT NOT NULL,
+        #action CHAR(5) NOT NULL,
+        #allIn BOOLEAN NOT NULL,
+        #amount INT NOT NULL,
+
+
+        q = self.sql.query['store_hands_actions']
+        #q = q.replace('%s', self.sql.query['placeholder'])
+
+        #print "DEBUG: inserts: %s" %inserts
+        #print "DEBUG: q: %s" % q
+        #c = self.get_cursor()
+        #c.executemany(q, inserts)
+
     def storeHudCache(self, gid, pids, starttime, pdata):
         """Update cached statistics. If update fails because no record exists, do an insert."""
 

pyfpdb/DerivedStats.py

@@ -36,6 +36,7 @@ class DerivedStats():
 
         self.hands        = {}
         self.handsplayers = {}
+        self.handsactions = {}
 
     def getStats(self, hand):
         
@@ -92,12 +93,16 @@ class DerivedStats():
         self.assembleHands(self.hand)
         self.assembleHandsPlayers(self.hand)
 
+        if DEBUG:
+            self.assembleHandsActions(self.hand)
 
         if DEBUG:
-            print "Hands:"
+            #print "Hands:"
-            pp.pprint(self.hands)
+            #pp.pprint(self.hands)
-            print "HandsPlayers:"
+            #print "HandsPlayers:"
-            pp.pprint(self.handsplayers)
+            #pp.pprint(self.handsplayers)
+            print "HandsActions:"
+            pp.pprint(self.handsactions)
 
     def getHands(self):
         return self.hands
@@ -105,6 +110,9 @@ class DerivedStats():
     def getHandsPlayers(self):
         return self.handsplayers
 
+    def getHandsActions(self):
+        return self.handsactions
+
     def assembleHands(self, hand):
         self.hands['tableName']  = hand.tablename
         self.hands['siteHandNo'] = hand.handid
@@ -207,6 +215,10 @@ class DerivedStats():
         # 3betSB, 3betBB
         # Squeeze, Ratchet?
 
+    def assembleHandsActions(self, hand):
+        print "DEBUG: hand.actions"
+        pp.pprint(hand.actions)
+        pass
 
     def setPositions(self, hand):
         """Sets the position for each player in HandsPlayers

pyfpdb/EverleafToFpdb.py

@@ -22,6 +22,18 @@ import sys
 import logging
 from HandHistoryConverter import *
 
+import locale
+lang=locale.getdefaultlocale()[0][0:2]
+if lang=="en":
+    def _(string): return string
+else:
+    import gettext
+    try:
+        trans = gettext.translation("fpdb", localedir="locale", languages=[lang])
+        trans.install()
+    except IOError:
+        def _(string): return string
+
 # Class for converting Everleaf HH format.
 
 class Everleaf(HandHistoryConverter):
@@ -133,7 +145,7 @@ or None if we fail to get the info """
     def readHandInfo(self, hand):
         m = self.re_HandInfo.search(hand.handText)
         if(m == None):
-            logging.info("Didn't match re_HandInfo")
+            logging.info(_("Didn't match re_HandInfo"))
             logging.info(hand.handText)
             return None
         logging.debug("HID %s, Table %s" % (m.group('HID'),  m.group('TABLE')))
@@ -202,7 +214,7 @@ or None if we fail to get the info """
         hand.setCommunityCards(street=street, cards=cards)
 
     def readAntes(self, hand):
-        logging.debug("reading antes")
+        logging.debug(_("reading antes"))
         m = self.re_Antes.finditer(hand.handText)
         for player in m:
             logging.debug("hand.addAnte(%s,%s)" %(player.group('PNAME'), player.group('ANTE')))
@@ -214,14 +226,14 @@ or None if we fail to get the info """
             logging.debug("Player bringing in: %s for %s" %(m.group('PNAME'),  m.group('BRINGIN')))
             hand.addBringIn(m.group('PNAME'),  m.group('BRINGIN'))
         else:
-            logging.warning("No bringin found.")
+            logging.warning(_("No bringin found."))
 
     def readBlinds(self, hand):
         m = self.re_PostSB.search(hand.handText)
         if m is not None:
             hand.addBlind(m.group('PNAME'), 'small blind', m.group('SB'))
         else:
-            logging.debug("No small blind")
+            logging.debug(_("No small blind"))
             hand.addBlind(None, None, None)
         for a in self.re_PostBB.finditer(hand.handText):
             hand.addBlind(a.group('PNAME'), 'big blind', a.group('BB'))
@@ -249,7 +261,7 @@ or None if we fail to get the info """
 
     def readStudPlayerCards(self, hand, street):
         # lol. see Plymouth.txt
-        logging.warning("Everleaf readStudPlayerCards is only a stub.")
+        logging.warning(_("Everleaf readStudPlayerCards is only a stub."))
         #~ if street in ('THIRD', 'FOURTH',  'FIFTH',  'SIXTH'):
             #~ hand.addPlayerCards(player = player.group('PNAME'), street = street,  closed = [],  open = [])
 
@@ -272,7 +284,7 @@ or None if we fail to get the info """
             elif action.group('ATYPE') == ' complete to':
                 hand.addComplete( street, action.group('PNAME'), action.group('BET'))
             else:
-                logging.debug("Unimplemented readAction: %s %s" %(action.group('PNAME'),action.group('ATYPE'),))
+                logging.debug(_("Unimplemented readAction: %s %s" %(action.group('PNAME'),action.group('ATYPE'),)))
 
 
     def readShowdownActions(self, hand):
@@ -281,7 +293,7 @@ or None if we fail to get the info """
         for shows in self.re_ShowdownAction.finditer(hand.handText):
             cards = shows.group('CARDS')
             cards = cards.split(', ')
-            logging.debug("readShowdownActions %s %s" %(cards, shows.group('PNAME')))
+            logging.debug(_("readShowdownActions %s %s" %(cards, shows.group('PNAME'))))
             hand.addShownCards(cards, shows.group('PNAME'))
 
 
@@ -310,9 +322,9 @@ or None if we fail to get the info """
 
 if __name__ == "__main__":
     parser = OptionParser()
-    parser.add_option("-i", "--input", dest="ipath", help="parse input hand history", default="-")
+    parser.add_option("-i", "--input", dest="ipath", help=_("parse input hand history"), default="-")
-    parser.add_option("-o", "--output", dest="opath", help="output translation to", default="-")
+    parser.add_option("-o", "--output", dest="opath", help=_("output translation to"), default="-")
-    parser.add_option("-f", "--follow", dest="follow", help="follow (tail -f) the input", action="store_true", default=False)
+    parser.add_option("-f", "--follow", dest="follow", help=_("follow (tail -f) the input"), action="store_true", default=False)
     parser.add_option("-q", "--quiet",
                   action="store_const", const=logging.CRITICAL, dest="verbosity", default=logging.INFO)
     parser.add_option("-v", "--verbose",

pyfpdb/Filters.py

@@ -63,7 +63,7 @@ class Filters(threading.Thread):
                           ,'seatsbetween':_('Between:'), 'seatsand':_('And:'), 'seatsshow':_('Show Number of _Players')
                           ,'playerstitle':_('Hero:'), 'sitestitle':_('Sites:'), 'gamestitle':_('Games:')
                           ,'limitstitle':_('Limits:'), 'seatstitle':_('Number of Players:')
-                          ,'groupstitle':_('Grouping:'), 'posnshow':_('Show Position Stats:')
+                          ,'groupstitle':_('Grouping:'), 'posnshow':_('Show Position Stats')
                           ,'datestitle':_('Date:')
                           ,'groupsall':_('All Players')
                           ,'limitsFL':'FL', 'limitsNL':'NL', 'limitsPL':'PL', 'ring':_('Ring'), 'tour':_('Tourney')
@@ -891,7 +891,7 @@ class Filters(threading.Thread):
         hbox = gtk.HBox()
         vbox1.pack_start(hbox, False, True, 0)
 
-        lbl_start = gtk.Label('From:')
+        lbl_start = gtk.Label(_('From:'))
 
         btn_start = gtk.Button()
         btn_start.set_image(gtk.image_new_from_stock(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON))
@@ -905,7 +905,7 @@ class Filters(threading.Thread):
         hbox = gtk.HBox()
         vbox1.pack_start(hbox, False, True, 0)
 
-        lbl_end = gtk.Label('  To:')
+        lbl_end = gtk.Label(_('To:'))
         btn_end = gtk.Button()
         btn_end.set_image(gtk.image_new_from_stock(gtk.STOCK_INDEX, gtk.ICON_SIZE_BUTTON))
         btn_end.connect('clicked', self.__calendar_dialog, self.end_date)

pyfpdb/FulltiltToFpdb.py

@@ -18,6 +18,18 @@
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 ########################################################################
 
+import locale
+lang=locale.getdefaultlocale()[0][0:2]
+if lang=="en":
+    def _(string): return string
+else:
+    import gettext
+    try:
+        trans = gettext.translation("fpdb", localedir="locale", languages=[lang])
+        trans.install()
+    except IOError:
+        def _(string): return string
+
 import logging
 from HandHistoryConverter import *
 #import TourneySummary
@@ -206,10 +218,9 @@ class Fulltilt(HandHistoryConverter):
     def readHandInfo(self, hand):
         m =  self.re_HandInfo.search(hand.handText)
         if m is None:
-            logging.info("Didn't match re_HandInfo")
+            logging.info(_("Didn't match re_HandInfo"))
             logging.info(hand.handText)
-            # Should this throw an exception? - CG
+            raise FpdbParseError("No match in readHandInfo.")
-            return None
         hand.handid = m.group('HID')
         hand.tablename = m.group('TABLE')
 
@@ -337,7 +348,7 @@ class Fulltilt(HandHistoryConverter):
             hand.addBlind(a.group('PNAME'), 'small & big blinds', a.group('SBBB'))
 
     def readAntes(self, hand):
-        logging.debug("reading antes")
+        logging.debug(_("reading antes"))
         m = self.re_Antes.finditer(hand.handText)
         for player in m:
             logging.debug("hand.addAnte(%s,%s)" %(player.group('PNAME'), player.group('ANTE')))
@@ -347,10 +358,10 @@ class Fulltilt(HandHistoryConverter):
     def readBringIn(self, hand):
         m = self.re_BringIn.search(hand.handText,re.DOTALL)
         if m:
-            logging.debug("Player bringing in: %s for %s" %(m.group('PNAME'),  m.group('BRINGIN')))
+            logging.debug(_("Player bringing in: %s for %s") %(m.group('PNAME'),  m.group('BRINGIN')))
             hand.addBringIn(m.group('PNAME'),  m.group('BRINGIN'))
         else:
-            logging.warning("No bringin found, handid =%s" % hand.handid)
+            logging.warning(_("No bringin found, handid =%s") % hand.handid)
 
     def readButton(self, hand):
         hand.buttonpos = int(self.re_Button.search(hand.handText).group('BUTTON'))
@@ -407,7 +418,7 @@ class Fulltilt(HandHistoryConverter):
             elif action.group('ATYPE') == ' checks':
                 hand.addCheck( street, action.group('PNAME'))
             else:
-                print "FullTilt: DEBUG: unimplemented readAction: '%s' '%s'" %(action.group('PNAME'),action.group('ATYPE'),)
+                print _("FullTilt: DEBUG: unimplemented readAction: '%s' '%s'") %(action.group('PNAME'),action.group('ATYPE'),)
 
 
     def readShowdownActions(self, hand):
@@ -483,7 +494,7 @@ class Fulltilt(HandHistoryConverter):
         
         m = self.re_TourneyInfo.search(tourneyText)
         if not m: 
-            log.info( "determineTourneyType : Parsing NOK" )
+            log.info(_("determineTourneyType : Parsing NOK"))
             return False
         mg = m.groupdict()
         #print mg
@@ -541,7 +552,7 @@ class Fulltilt(HandHistoryConverter):
         if mg['TOURNO'] is not None:
             tourney.tourNo = mg['TOURNO']
         else:
-            log.info( "Unable to get a valid Tournament ID -- File rejected" )
+            log.info(_("Unable to get a valid Tournament ID -- File rejected"))
             return False
         if tourney.isMatrix:
             if mg['MATCHNO'] is not None:
@@ -572,18 +583,18 @@ class Fulltilt(HandHistoryConverter):
                         tourney.buyin = 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN']))
                     else :
                         if 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN'])) != tourney.buyin:
-                            log.error( "Conflict between buyins read in topline (%s) and in BuyIn field (%s)" % (tourney.buyin, 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN']))) )
+                            log.error(_("Conflict between buyins read in topline (%s) and in BuyIn field (%s)") % (tourney.buyin, 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN']))) )
                             tourney.subTourneyBuyin = 100*Decimal(re.sub(u',', u'', "%s" % mg['BUYIN']))
                 if mg['FEE'] is not None:
                     if tourney.fee is None:
                         tourney.fee = 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE']))
                     else :
                         if 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE'])) != tourney.fee:
-                            log.error( "Conflict between fees read in topline (%s) and in BuyIn field (%s)" % (tourney.fee, 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE']))) )
+                            log.error(_("Conflict between fees read in topline (%s) and in BuyIn field (%s)") % (tourney.fee, 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE']))) )
                             tourney.subTourneyFee = 100*Decimal(re.sub(u',', u'', "%s" % mg['FEE']))
 
         if tourney.buyin is None:
-            log.info( "Unable to affect a buyin to this tournament : assume it's a freeroll" )
+            log.info(_("Unable to affect a buyin to this tournament : assume it's a freeroll"))
             tourney.buyin = 0
             tourney.fee = 0
         else:
@@ -684,7 +695,7 @@ class Fulltilt(HandHistoryConverter):
 
                 tourney.addPlayer(rank, a.group('PNAME'), winnings, "USD", 0, 0, 0) #TODO: make it store actual winnings currency
             else:
-                print "FullTilt: Player finishing stats unreadable : %s" % a
+                print (_("FullTilt: Player finishing stats unreadable : %s") % a)
 
         # Find Hero
         n = self.re_TourneyHeroFinishingP.search(playersText)
@@ -693,17 +704,17 @@ class Fulltilt(HandHistoryConverter):
             tourney.hero = heroName
             # Is this really useful ?
             if heroName not in tourney.ranks:
-                print "FullTilt:", heroName, "not found in tourney.ranks ..."
+                print (_("FullTilt: %s not found in tourney.ranks ...") % heroName)
             elif (tourney.ranks[heroName] != Decimal(n.group('HERO_FINISHING_POS'))):            
-                print "FullTilt: Bad parsing : finish position incoherent : %s / %s" % (tourney.ranks[heroName], n.group('HERO_FINISHING_POS'))
+                print (_("FullTilt: Bad parsing : finish position incoherent : %s / %s") % (tourney.ranks[heroName], n.group('HERO_FINISHING_POS')))
 
         return True
 
 if __name__ == "__main__":
     parser = OptionParser()
-    parser.add_option("-i", "--input", dest="ipath", help="parse input hand history", default="regression-test-files/fulltilt/razz/FT20090223 Danville - $0.50-$1 Ante $0.10 - Limit Razz.txt")
+    parser.add_option("-i", "--input", dest="ipath", help=_("parse input hand history"), default="regression-test-files/fulltilt/razz/FT20090223 Danville - $0.50-$1 Ante $0.10 - Limit Razz.txt")
-    parser.add_option("-o", "--output", dest="opath", help="output translation to", default="-")
+    parser.add_option("-o", "--output", dest="opath", help=_("output translation to"), default="-")
-    parser.add_option("-f", "--follow", dest="follow", help="follow (tail -f) the input", action="store_true", default=False)
+    parser.add_option("-f", "--follow", dest="follow", help=_("follow (tail -f) the input"), action="store_true", default=False)
     parser.add_option("-q", "--quiet",
                   action="store_const", const=logging.CRITICAL, dest="verbosity", default=logging.INFO)
     parser.add_option("-v", "--verbose",

pyfpdb/GuiAutoImport.py

@@ -119,7 +119,7 @@ class GuiAutoImport (threading.Thread):
         hbox.pack_start(lbl1, expand=True, fill=False)
 
         self.doAutoImportBool = False
-        self.startButton = gtk.ToggleButton(_("  Start _Autoimport  "))
+        self.startButton = gtk.ToggleButton(_("  Start _Auto Import  "))
         self.startButton.connect("clicked", self.startClicked, "start clicked")
         hbox.pack_start(self.startButton, expand=False, fill=False)
 
@@ -138,7 +138,7 @@ class GuiAutoImport (threading.Thread):
         scrolledwindow.add(self.textview)
 
         self.mainVBox.show_all()
-        self.addText(_("AutoImport Ready."))
+        self.addText(_("Auto Import Ready."))
 
     def addText(self, text):
         end_iter = self.textbuffer.get_end_iter()
@@ -151,7 +151,7 @@ class GuiAutoImport (threading.Thread):
         """runs when user clicks one of the browse buttons in the auto import tab"""
         current_path=data[1].get_text()
 
-        dia_chooser = gtk.FileChooserDialog(title=_("Please choose the path that you want to auto import"),
+        dia_chooser = gtk.FileChooserDialog(title=_("Please choose the path that you want to Auto Import"),
                 action=gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER,
                 buttons=(gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_OPEN,gtk.RESPONSE_OK))
         #dia_chooser.set_current_folder(pathname)
@@ -185,9 +185,9 @@ class GuiAutoImport (threading.Thread):
 
     def reset_startbutton(self):
         if self.pipe_to_hud is not None:
-            self.startButton.set_label(_(u'  Stop _Autoimport  '))
+            self.startButton.set_label(_(u'  Stop _Auto Import  '))
         else:
-            self.startButton.set_label(_(u'  Start _Autoimport  '))
+            self.startButton.set_label(_(u'  Start _Auto Import  '))
 
         return False
 
@@ -212,7 +212,7 @@ class GuiAutoImport (threading.Thread):
             if self.settings['global_lock'].acquire(False):   # returns false immediately if lock not acquired
                 self.addText(_("\nGlobal lock taken ... Auto Import Started.\n"))
                 self.doAutoImportBool = True
-                widget.set_label(_(u'  _Stop Autoimport  '))
+                widget.set_label(_(u'  _Stop Auto Import  '))
                 if self.pipe_to_hud is None:
                     if Configuration.FROZEN:
                         path = Configuration.EXEC_PATH
@@ -252,19 +252,19 @@ class GuiAutoImport (threading.Thread):
                     self.importtimer = gobject.timeout_add(interval * 1000, self.do_import)
 
             else:
-                self.addText(_("\nauto-import aborted - global lock not available"))
+                self.addText(_("\nAuto Import aborted - global lock not available"))
         else: # toggled off
             gobject.source_remove(self.importtimer)
             self.settings['global_lock'].release()
             self.doAutoImportBool = False # do_import will return this and stop the gobject callback timer
-            self.addText(_("\nStopping autoimport - global lock released."))
+            self.addText(_("\nStopping Auto Import - global lock released."))
             if self.pipe_to_hud.poll() is not None:
-                self.addText(_("\n * Stop Autoimport: HUD already terminated"))
+                self.addText(_("\n * Stop Auto Import: HUD already terminated"))
             else:
                 #print >>self.pipe_to_hud.stdin, "\n"
                 self.pipe_to_hud.communicate('\n') # waits for process to terminate
             self.pipe_to_hud = None
-            self.startButton.set_label(_(u'  Start _Autoimport  '))
+            self.startButton.set_label(_(u'  Start _Auto Import  '))
 
     #end def GuiAutoImport.startClicked
 

pyfpdb/GuiBulkImport.py

@@ -136,7 +136,7 @@ class GuiBulkImport():
             #self.settings['global_lock'].release()
                 self.settings['global_lock'].release()
         else:
-            print _("bulk-import aborted - global lock not available")
+            print _("bulk import aborted - global lock not available")
 
     def get_vbox(self):
         """returns the vbox of this thread"""

pyfpdb/GuiDatabase.py

@@ -300,7 +300,7 @@ class GuiDatabase:
             self.dia.show()
         except:
             err = traceback.extract_tb(sys.exc_info()[2])[-1]
-            print _('loaddbs error: ')+str(dbms_num)+','+host+','+name+','+user+','+passwd+' failed: ' \
+            print _('loadDbs error: ')+str(dbms_num)+','+host+','+name+','+user+','+passwd+' failed: ' \
                       + err[2] + "(" + str(err[1]) + "): " + str(sys.exc_info()[1])
 
     def sortCols(self, col, n):
@@ -368,7 +368,7 @@ class GuiDatabase:
         try:
             # is creating empty db for sqlite ... mod db.py further?
             # add noDbTables flag to db.py?
-            log.debug(_("loaddbs: trying to connect to: %s/%s, %s, %s/%s") % (str(dbms_num),dbms,name,user,passwd))
+            log.debug(_("testDB: trying to connect to: %s/%s, %s, %s/%s") % (str(dbms_num),dbms,name,user,passwd))
             db.connect(backend=dbms_num, host=host, database=name, user=user, password=passwd, create=False)
             if db.connected:
                 log.debug(_("         connected ok"))
@@ -384,14 +384,16 @@ class GuiDatabase:
             status = "failed"
             icon = gtk.STOCK_CANCEL
         except Exceptions.FpdbMySQLNoDatabase:
-            err_msg = _("MySQL client reports: 2002 or 2003 error. Unable to connect - Please check that the MySQL service has been started")
+            err_msg = _("MySQL client reports: 2002 or 2003 error. Unable to connect - ") \
+                      + _("Please check that the MySQL service has been started")
             status = "failed"
             icon = gtk.STOCK_CANCEL
         except Exceptions.FpdbPostgresqlAccessDenied:
-            err_msg = _("Postgres Server reports: Access denied. Are your permissions set correctly?")
+            err_msg = _("PostgreSQL Server reports: Access denied. Are your permissions set correctly?")
             status = "failed"
         except Exceptions.FpdbPostgresqlNoDatabase:
-            err_msg = _("Postgres client reports: Unable to connect - Please check that the Postgres service has been started")
+            err_msg = _("PostgreSQL client reports: Unable to connect - ") \
+                      + _("Please check that the PostgreSQL service has been started")
             status = "failed"
             icon = gtk.STOCK_CANCEL
         except:
@@ -401,8 +403,7 @@ class GuiDatabase:
             status = "failed"
             icon = gtk.STOCK_CANCEL
         if err_msg:
-            log.info( _('db connection to ') + str(dbms_num)+','+host+','+name+','+user+','+passwd+' failed: '
+            log.info( _('db connection to %s, %s, %s, %s, %s failed: %s') % (str(dbms_num), host, name, user, passwd, err_msg))
-                      + err_msg )
 
         return( status, err_msg, icon )
 
@@ -410,7 +411,7 @@ class GuiDatabase:
 class AddDB(gtk.Dialog):
 
     def __init__(self, config, parent):
-        log.debug("AddDB starting")
+        log.debug(_("AddDB starting"))
         self.dbnames = { 'Sqlite'     : Configuration.DATABASE_TYPE_SQLITE
                        , 'MySQL'      : Configuration.DATABASE_TYPE_MYSQL
                        , 'PostgreSQL' : Configuration.DATABASE_TYPE_POSTGRESQL
@@ -419,7 +420,7 @@ class AddDB(gtk.Dialog):
         # create dialog and add icon and label
         super(AddDB,self).__init__( parent=parent
                                   , flags=gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT
-                                  , title="Add New Database"
+                                  , title=_("Add New Database")
                                   , buttons = (gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT
                                               ,gtk.STOCK_SAVE, gtk.RESPONSE_ACCEPT)
                                   ) # , buttons=btns
@@ -487,7 +488,7 @@ class AddDB(gtk.Dialog):
 
     def run(self):
         response = super(AddDB,self).run()
-        log.debug("adddb.run: response is "+str(response)+" accept is "+str(int(gtk.RESPONSE_ACCEPT)))
+        log.debug(_("addDB.run: response is %s accept is %s" % (str(response), str(int(gtk.RESPONSE_ACCEPT)))))
 
         ok,retry = False,True
         while response == gtk.RESPONSE_ACCEPT:
@@ -501,7 +502,7 @@ class AddDB(gtk.Dialog):
         ,name, db_desc, user, passwd, host) = ("error", "error", None, None, None
                                               ,None, None, None, None, None)
         if ok:
-            log.debug("start creating new db")
+            log.debug(_("start creating new db"))
             # add a new db
             master_password = None
             dbms     = self.dbnames[ self.cb_dbms.get_active_text() ]
@@ -520,7 +521,7 @@ class AddDB(gtk.Dialog):
 
             # test db after creating?
             status, err_msg, icon = GuiDatabase.testDB(self.config, dbms, dbms_num, name, user, passwd, host)
-            log.debug('tested new db, result='+str((status,err_msg)))
+            log.debug(_('tested new db, result=%s') % str((status,err_msg)))
             if status == 'ok':
                 #dia = InfoBox( parent=self, str1=_('Database created') )
                 str1 = _('Database created')
@@ -539,7 +540,7 @@ class AddDB(gtk.Dialog):
         """check fields and return true/false according to whether user wants to try again
            return False if fields are ok
         """
-        log.debug("check_fields: starting")
+        log.debug(_("check_fields: starting"))
         try_again = False
         ok = True
 
@@ -571,11 +572,11 @@ class AddDB(gtk.Dialog):
                 # checks for postgres
                 pass
             else:
-                msg = "Unknown Database Type selected"
+                msg = _("Unknown Database Type selected")
                 ok = False
 
         if not ok:
-            log.debug("check_fields: open dialog")
+            log.debug(_("check_fields: open dialog"))
             dia = gtk.MessageDialog( parent=self
                                    , flags=gtk.DIALOG_DESTROY_WITH_PARENT
                                    , type=gtk.MESSAGE_ERROR
@@ -588,14 +589,14 @@ class AddDB(gtk.Dialog):
             dia.vbox.add(l)
             dia.show_all()
             ret = dia.run()
-            log.debug("check_fields: ret is "+str(ret)+" cancel is "+str(int(gtk.RESPONSE_CANCEL)))
+            log.debug(_("check_fields: ret is %s cancel is %s" % (str(ret), str(int(gtk.RESPONSE_CANCEL)))))
             if ret == gtk.RESPONSE_YES:
                 try_again = True
-            log.debug("check_fields: destroy dialog")
+            log.debug(_("check_fields: destroy dialog"))
             dia.hide()
             dia.destroy()
 
-        log.debug("check_fields: returning ok as "+str(ok)+", try_again as "+str(try_again))
+        log.debug(_("check_fields: returning ok as %s, try_again as %s") % (str(ok), str(try_again)))
         return(ok,try_again)
 
     def db_type_changed(self, widget, data):

pyfpdb/GuiGraphViewer.py

@@ -26,22 +26,6 @@ from time import *
 from datetime import datetime
 #import pokereval
 
-try:
-    import matplotlib
-    matplotlib.use('GTKCairo')
-    from matplotlib.figure import Figure
-    from matplotlib.backends.backend_gtk import FigureCanvasGTK as FigureCanvas
-    from matplotlib.backends.backend_gtkagg import NavigationToolbar2GTKAgg as NavigationToolbar
-    from matplotlib.font_manager import FontProperties
-    from numpy import arange, cumsum
-    from pylab import *
-except ImportError, inst:
-    print _("""Failed to load libs for graphing, graphing will not function. Please
-                 install numpy and matplotlib if you want to use graphs.""")
-    print _("""This is of no consequence for other parts of the program, e.g. import 
-         and HUD are NOT affected by this problem.""")
-    print "ImportError: %s" % inst.args
-
 import locale
 lang=locale.getdefaultlocale()[0][0:2]
 if lang=="en":
@@ -59,6 +43,22 @@ import Database
 import Filters
 import Charset
 
+try:
+    import matplotlib
+    matplotlib.use('GTKCairo')
+    from matplotlib.figure import Figure
+    from matplotlib.backends.backend_gtk import FigureCanvasGTK as FigureCanvas
+    from matplotlib.backends.backend_gtkagg import NavigationToolbar2GTKAgg as NavigationToolbar
+    from matplotlib.font_manager import FontProperties
+    from numpy import arange, cumsum
+    from pylab import *
+except ImportError, inst:
+    print _("""Failed to load libs for graphing, graphing will not function. Please
+                 install numpy and matplotlib if you want to use graphs.""")
+    print _("""This is of no consequence for other parts of the program, e.g. import 
+         and HUD are NOT affected by this problem.""")
+    print "ImportError: %s" % inst.args
+
 class GuiGraphViewer (threading.Thread):
 
     def __init__(self, querylist, config, parent, debug=True):

pyfpdb/Hand.py

@@ -274,6 +274,7 @@ db: a connected Database object"""
             db.storeHandsPlayers(self.dbid_hands, self.dbid_pids, self.stats.getHandsPlayers(), printdata = printtest)
             # TODO HandsActions - all actions for all players for all streets - self.actions
             # HudCache data can be generated from HandsActions (HandsPlayers?)
+            #db.storeHandsActions(self.dbid_hands, self.dbid_pids, self.stats.getHandsActions(), printdata = printtest)
         else:
             log.info(_("Hand.insert(): hid #: %s is a duplicate") % hh['siteHandNo'])
             self.is_duplicate = True  # i.e. don't update hudcache

pyfpdb/Hud.py

@@ -55,7 +55,6 @@ else:
         def _(string): return string
 
 #    FreePokerTools modules
-import Tables # needed for testing only
 import Configuration
 import Stats
 import Mucked
@@ -587,7 +586,7 @@ class Hud:
 
         self.stat_dict = stat_dict
         self.cards = cards
-        sys.stderr.write(_("------------------------------------------------------------\nCreating hud from hand %s\n") % hand)
+        log.info(_('Creating hud from hand ')+str(hand))
         adj = self.adj_seats(hand, config)
         loc = self.config.get_locations(self.table.site, self.max)
         if loc is None and self.max != 10:
@@ -941,26 +940,3 @@ class Popup_window:
 #        window.present()
 
 
-if __name__== "__main__":
-    main_window = gtk.Window()
-    main_window.connect("destroy", destroy)
-    label = gtk.Label(_('Fake main window, blah blah, blah\nblah, blah'))
-    main_window.add(label)
-    main_window.show_all()
-
-    c = Configuration.Config()
-    #tables = Tables.discover(c)
-    t = Tables.discover_table_by_name(c, "Corona")
-    if t is None:
-        print _("Table not found.")
-    db = Database.Database(c, 'fpdb', 'holdem')
-
-    stat_dict = db.get_stats_from_hand(1)
-
-#    for t in tables:
-    win = Hud(None, t, 10, 'holdem', c, db) # parent, table, max, poker_game, config, db_connection
-    win.create(1, c, stat_dict, None) # hand, config, stat_dict, cards):
-#        t.get_details()
-    win.update(8300, c) # self, hand, config):
-
-    gtk.main()

pyfpdb/PartyPokerToFpdb.py

@@ -502,6 +502,9 @@ class PartyPoker(HandHistoryConverter):
         if type=="tour":
             TableName = table_name.split(" ")
             print 'party', 'getTableTitleRe', "%s.+Table\s#%s" % (TableName[0], table_number)
+            if len(TableName[1]) > 6:
+                return "#%s" % (table_number)
+            else:
                 return "%s.+Table\s#%s" % (TableName[0], table_number)
         else:
             print 'party', 'getTableTitleRe', table_number

pyfpdb/PokerStarsToFpdb.py

@@ -225,13 +225,14 @@ class PokerStars(HandHistoryConverter):
     def readHandInfo(self, hand):
         info = {}
         m  = self.re_HandInfo.search(hand.handText,re.DOTALL)
-        if m:
+        m2 = self.re_GameInfo.search(hand.handText)
-            info.update(m.groupdict())
+        if m is None or m2 is None:
-        else:
+            logging.info("Didn't match re_HandInfo")
-            pass  # throw an exception here, eh?
+            logging.info(hand.handText)
-        m = self.re_GameInfo.search(hand.handText)
+            raise FpdbParseError("No match in readHandInfo.")
-        if m:
+
         info.update(m.groupdict())
+        info.update(m2.groupdict())
 
         log.debug("readHandInfo: %s" % info)
         for key in info:

pyfpdb/SQL.py

@@ -4222,6 +4222,19 @@ class Sql:
                     %s, %s, %s, %s, %s
                 )"""
 
+        self.query['store_hands_actions'] = """INSERT INTO HandsActions (
+                        handsPlayerId,
+                        street,
+                        actionNo,
+                        action,
+                        allIn,
+                        amount
+               )
+               VALUES (
+                    %s, %s, %s, %s, %s,
+                    %s
+                )"""
+        
         ################################
         # Counts for DB stats window
         ################################

pyfpdb/Stats.py

@@ -78,45 +78,49 @@ log = logging.getLogger("db")
 
 
 re_Places = re.compile("_[0-9]$")
-re_Percent = re.compile("%$")
 
 # String manipulation
 import codecs
 encoder = codecs.lookup(Configuration.LOCALE_ENCODING)
 
+
+# Since tuples are immutable, we have to create a new one when
+# overriding any decimal placements. Copy old ones and recreate the
+# second value in tuple to specified format-
+def __stat_override(decimals, stat_vals):
+    s = '%.*f' % (decimals, 100.0*stat_vals[0])
+    res = (stat_vals[0], s, stat_vals[2],
+            stat_vals[3], stat_vals[4], stat_vals[5])
+    return res
+
+
 def do_tip(widget, tip):
     _tip = Charset.to_utf8(tip)
     widget.set_tooltip_text(_tip)
 
-def do_stat(stat_dict, player = 24, stat = 'vpip'):
-    match = re_Places.search(stat)
-    if match is None:
-        result = eval("%(stat)s(stat_dict, %(player)d)" % {'stat': stat, 'player': player})
-    else:
-        base = stat[0:-2]
-        places = int(stat[-1:])
-        result = (0.0, '0.0', 'notset=0', 'notset=0', '0', 'not set')
-        try:
-            result = eval("%(stat)s(stat_dict, %(player)d)" % {'stat': base, 'player': player})
-        except:
-            pass #
-            log.info(_("exception getting stat %s for player %s %s") % (base, str(player), str(sys.exc_info())))
-        log.debug(_("Stats.do_stat result = %s") % str(result) )
 
-        match = re_Percent.search(result[1])
+def do_stat(stat_dict, player = 24, stat = 'vpip'):
-        try:
+    statname = stat
-            if match is None:
+    match = re_Places.search(stat)
-                result = (result[0], "%.*f" % (places, result[0]), result[2], result[3], result[4], result[5])
+    if match:   # override if necessary
-            else:
+        statname = stat[0:-2]
-                result = (result[0], "%.*f%%" % (places, 100*result[0]), result[2], result[3], result[4], result[5])
+
-        except:
+    result = eval("%(stat)s(stat_dict, %(player)d)" % {'stat': statname, 'player': player})
-            log.info(_("error: %s") % str(sys.exc_info()))
+
-            raise
+    # If decimal places have been defined, override result[1]
+    # NOTE: decimal place override ALWAYS assumes the raw result is a
+    # fraction (x/100); manual decimal places really only make sense for
+    # percentage values. Also, profit/100 hands (bb/BB) already default
+    # to three decimal places anyhow, so they are unlikely override
+    # candidates.
+    if match:
+        places = int(stat[-1:])
+        result = __stat_override(places, result)
     return result
 
 #    OK, for reference the tuple returned by the stat is:
 #    0 - The stat, raw, no formating, eg 0.33333333
-#    1 - formatted stat with appropriate precision and punctuation, eg 33%
+#    1 - formatted stat with appropriate precision, eg. 33; shown in HUD
 #    2 - formatted stat with appropriate precision, punctuation and a hint, eg v=33%
 #    3 - same as #2 except name of stat instead of hint, eg vpip=33%
 #    4 - the calculation that got the stat, eg 9/27
@@ -147,17 +151,17 @@ def vpip(stat_dict, player):
     try:
         stat = float(stat_dict[player]['vpip'])/float(stat_dict[player]['n'])
         return (stat,
-                '%3.1f'      % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'v=%3.1f'    % (100*stat) + '%',
+                'v=%3.1f%%'     % (100.0*stat),
-                'vpip=%3.1f' % (100*stat) + '%',
+                'vpip=%3.1f%%'  % (100.0*stat),
                 '(%d/%d)'       % (stat_dict[player]['vpip'], stat_dict[player]['n']),
                 _('Voluntarily Put In Pot Pre-Flop%')
                 )
     except: return (stat,
-                    '%3.1f'      % (0) + '%',
+                    'NA',
-                    'v=%3.1f'    % (0) + '%',
+                    'v=NA',
-                    'vpip=%3.1f' % (0) + '%',
+                    'vpip=NA',
-                    '(%d/%d)'    % (0, 0),
+                    '(0/0)',
                     _('Voluntarily Put In Pot Pre-Flop%')
                     )
 
@@ -167,18 +171,18 @@ def pfr(stat_dict, player):
     try:
         stat = float(stat_dict[player]['pfr'])/float(stat_dict[player]['n'])
         return (stat,
-                '%3.1f'      % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'p=%3.1f'    % (100*stat) + '%',
+                'p=%3.1f%%'     % (100.0*stat),
-                'pfr=%3.1f'  % (100*stat) + '%',
+                'pfr=%3.1f%%'   % (100.0*stat),
                 '(%d/%d)'    % (stat_dict[player]['pfr'], stat_dict[player]['n']),
                 _('Pre-Flop Raise %')
                 )
     except: 
         return (stat,
-                '%3.1f'      % (0) + '%',
+                'NA',
-                'p=%3.1f'    % (0) + '%',
+                'p=NA',
-                'pfr=%3.1f' % (0) + '%',
+                'pfr=NA',
-                '(%d/%d)'    % (0, 0),
+                '(0/0)',
                 _('Pre-Flop Raise %')
                 )
 
@@ -188,18 +192,18 @@ def wtsd(stat_dict, player):
     try:
         stat = float(stat_dict[player]['sd'])/float(stat_dict[player]['saw_f'])
         return (stat,
-                '%3.1f'      % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'w=%3.1f'    % (100*stat) + '%',
+                'w=%3.1f%%'     % (100.0*stat),
-                'wtsd=%3.1f' % (100*stat) + '%',
+                'wtsd=%3.1f%%'  % (100.0*stat),
                 '(%d/%d)'       % (stat_dict[player]['sd'], stat_dict[player]['saw_f']),
                 _('% went to showdown')
                 )
     except:
         return (stat,
-                '%3.1f'      % (0) + '%',
+                'NA',
-                'w=%3.1f'    % (0) + '%',
+                'w=NA',
-                'wtsd=%3.1f' % (0) + '%',
+                'wtsd=NA',
-                '(%d/%d)'    % (0, 0),
+                '(0/0)',
                 _('% went to showdown')
                 )
 
@@ -209,40 +213,42 @@ def wmsd(stat_dict, player):
     try:
         stat = float(stat_dict[player]['wmsd'])/float(stat_dict[player]['sd'])
         return (stat,
-                '%3.1f'      % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'w=%3.1f'    % (100*stat) + '%',
+                'w=%3.1f%%'     % (100.0*stat),
-                'wmsd=%3.1f' % (100*stat) + '%',
+                'wmsd=%3.1f%%'  % (100.0*stat),
                 '(%5.1f/%d)'    % (float(stat_dict[player]['wmsd']), stat_dict[player]['sd']),
                 _('% won money at showdown')
                 )
     except:
         return (stat,
-                '%3.1f'      % (0) + '%',
+                'NA',
-                'w=%3.1f'    % (0) + '%',
+                'w=NA',
-                'wmsd=%3.1f' % (0) + '%',
+                'wmsd=NA',
-                '(%d/%d)'    % (0, 0),
+                '(0/0)',
                 _('% won money at showdown')
                 )
 
+# Money is stored as pennies, so there is an implicit 100-multiplier
+# already in place
 def profit100(stat_dict, player):
     """    Profit won per 100 hands."""
     stat = 0.0
     try:
         stat = float(stat_dict[player]['net'])/float(stat_dict[player]['n'])
         return (stat,
-                '%.0f'        % (100.0*stat),
+                '%.2f'          % (stat),
-                'p=%.0f'     % (100.0*stat),
+                'p=%.2f'        % (stat),
-                'p/100=%.0f'  % (100.0*stat),
+                'p/100=%.2f'    % (stat),
                 '%d/%d' % (stat_dict[player]['net'], stat_dict[player]['n']),
                 _('profit/100hands')
                 )
     except:
             print _("exception calcing p/100: 100 * %d / %d") % (stat_dict[player]['net'], stat_dict[player]['n'])
             return (stat,
-                    '%.0f'       % (0.0),
+                    'NA',
-                    'p=%.0f'     % (0.0),
+                    'p=NA',
-                    'p/100=%.0f'  % (0.0),
+                    'p/100=NA',
-                    '(%d/%d)' % (0, 0),
+                    '(0/0)',
                     _('profit/100hands')
                     )
 
@@ -261,10 +267,10 @@ def bbper100(stat_dict, player):
     except:
         log.info("exception calcing bb/100: "+str(stat_dict[player]))
         return (stat,
-                '%.0f'       % (0),
+                'NA',
-                'bb100=%.0f'     % (0),
+                'bb100=NA',
-                'bb100=%.0f'  % (0),
+                'bb100=NA',
-                '(%f)' % (0),
+                '(--)',
                 _('big blinds/100 hands')
                 )
 
@@ -283,10 +289,10 @@ def BBper100(stat_dict, player):
     except:
         log.info(_("exception calcing BB/100: ")+str(stat_dict[player]))
         return (stat,
-                '%.0f'       % (0.0),
+                'NA',
-                'BB100=%.0f'     % (0.0),
+                'BB100=NA',
-                'BB100=%.0f'  % (0.0),
+                'BB100=NA',
-                '(%f)' % (0.0),
+                '(--)',
                 _('Big Bets/100 hands')
                 )
 
@@ -297,21 +303,19 @@ def saw_f(stat_dict, player):
         den = float(stat_dict[player]['n'])
         stat = num/den
         return (stat,
-            '%3.1f'      % (100*stat) + '%',
+            '%3.1f'         % (100.0*stat),
-            'sf=%3.1f'    % (100*stat) + '%',
+            'sf=%3.1f%%'    % (100.0*stat),
-            'saw_f=%3.1f' % (100*stat) + '%',
+            'saw_f=%3.1f%%' % (100.0*stat),
             '(%d/%d)'       % (stat_dict[player]['saw_f'], stat_dict[player]['n']),
             _('Flop Seen %')
             )
     except:
         stat = 0.0
-        num = 0
-        den = 0
         return (stat,
-            '%3.1f'       % (stat) + '%',
+            'NA',
-            'sf=%3.1f'    % (stat) + '%',
+            'sf=NA',
-            'saw_f=%3.1f' % (stat) + '%',
+            'saw_f=NA',
-            '(%d/%d)'     % (num, den),
+            '(0/0)',
             _('Flop Seen %')
             )
 
@@ -338,6 +342,7 @@ def n(stat_dict, player):
                 _('number hands seen')
                 )
     except:
+        # Number of hands shouldn't ever be "NA"; zeroes are better here
         return (0,
                 '%d'        % (0),
                 'n=%d'      % (0),
@@ -352,18 +357,18 @@ def fold_f(stat_dict, player):
     try:
         stat = float(stat_dict[player]['fold_2'])/float(stat_dict[player]['saw_f'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'             % (100.0*stat),
-                'ff=%3.1f'     % (100*stat) + '%',
+                'ff=%3.1f%%'        % (100.0*stat),
-                'fold_f=%3.1f' % (100*stat) + '%',
+                'fold_f=%3.1f%%'    % (100.0*stat),
                 '(%d/%d)'           % (stat_dict[player]['fold_2'], stat_dict[player]['saw_f']),
                 _('folded flop/4th')
                 )
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                'ff=%3.1f'     % (0) + '%',
+                'ff=NA',
-                'fold_f=%3.1f' % (0) + '%',
+                'fold_f=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('folded flop/4th')
                 )
            
@@ -373,9 +378,9 @@ def steal(stat_dict, player):
     try:
         stat = float(stat_dict[player]['steal'])/float(stat_dict[player]['steal_opp'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'st=%3.1f'     % (100*stat) + '%',
+                'st=%3.1f%%'    % (100.0*stat),
-                'steal=%3.1f' % (100*stat) + '%',
+                'steal=%3.1f%%' % (100.0*stat),
                 '(%d/%d)'       % (stat_dict[player]['steal'], stat_dict[player]['steal_opp']),
                 _('% steal attempted')
                 )
@@ -388,9 +393,9 @@ def f_SB_steal(stat_dict, player):
     try:
         stat = float(stat_dict[player]['sbnotdef'])/float(stat_dict[player]['sbstolen'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'fSB=%3.1f'     % (100*stat) + '%',
+                'fSB=%3.1f%%'   % (100.0*stat),
-                'fSB_s=%3.1f' % (100*stat) + '%',
+                'fSB_s=%3.1f%%' % (100.0*stat),
                 '(%d/%d)'       % (stat_dict[player]['sbnotdef'], stat_dict[player]['sbstolen']),
                 _('% folded SB to steal'))
     except:
@@ -407,9 +412,9 @@ def f_BB_steal(stat_dict, player):
     try:
         stat = float(stat_dict[player]['bbnotdef'])/float(stat_dict[player]['bbstolen'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'fBB=%3.1f'     % (100*stat) + '%',
+                'fBB=%3.1f%%'   % (100.0*stat),
-                'fBB_s=%3.1f' % (100*stat) + '%',
+                'fBB_s=%3.1f%%' % (100.0*stat),
                 '(%d/%d)'       % (stat_dict[player]['bbnotdef'], stat_dict[player]['bbstolen']),
                 _('% folded BB to steal'))
     except:
@@ -429,9 +434,9 @@ def f_steal(stat_dict, player):
         
         stat = float(folded_blind)/float(blind_stolen)
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'fB=%3.1f'     % (100*stat) + '%',
+                'fB=%3.1f%%'    % (100.0*stat),
-                'fB_s=%3.1f' % (100*stat) + '%',
+                'fB_s=%3.1f%%'  % (100.0*stat),
                 '(%d/%d)'       % (folded_blind, blind_stolen),
                 _('% folded blind to steal'))
     except:
@@ -448,17 +453,17 @@ def three_B(stat_dict, player):
     try:
         stat = float(stat_dict[player]['tb_0'])/float(stat_dict[player]['tb_opp_0'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                '3B=%3.1f'     % (100*stat) + '%',
+                '3B=%3.1f%%'    % (100.0*stat),
-                '3B_pf=%3.1f'  % (100*stat) + '%',
+                '3B_pf=%3.1f%%' % (100.0*stat),
                 '(%d/%d)'       % (stat_dict[player]['tb_0'], stat_dict[player]['tb_opp_0']),
                 _('% 3/4 Bet preflop/3rd'))
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                '3B=%3.1f'     % (0) + '%',
+                '3B=NA',
-                '3B_pf=%3.1f' % (0) + '%',
+                '3B_pf=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('% 3/4 Bet preflop/3rd'))
 
 def WMsF(stat_dict, player):
@@ -467,17 +472,17 @@ def WMsF(stat_dict, player):
     try:
         stat = float(stat_dict[player]['w_w_s_1'])/float(stat_dict[player]['saw_1'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'wf=%3.1f'     % (100*stat) + '%',
+                'wf=%3.1f%%'    % (100.0*stat),
-                'w_w_f=%3.1f'  % (100*stat) + '%',
+                'w_w_f=%3.1f%%' % (100.0*stat),
                 '(%d/%d)'       % (stat_dict[player]['w_w_s_1'], stat_dict[player]['saw_f']),
                 _('% won$/saw flop/4th'))
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                'wf=%3.1f'     % (0) + '%',
+                'wf=NA',
-                'w_w_f=%3.1f' % (0) + '%',
+                'w_w_f=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('% won$/saw flop/4th'))
 
 def a_freq1(stat_dict, player):
@@ -486,17 +491,17 @@ def a_freq1(stat_dict, player):
     try:
         stat = float(stat_dict[player]['aggr_1'])/float(stat_dict[player]['saw_f'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'             % (100.0*stat),
-                'a1=%3.1f'     % (100*stat) + '%',
+                'a1=%3.1f%%'        % (100.0*stat),
-                'a_fq_1=%3.1f'  % (100*stat) + '%',
+                'a_fq_1=%3.1f%%'    % (100.0*stat),
                 '(%d/%d)'      % (stat_dict[player]['aggr_1'], stat_dict[player]['saw_f']),
                 _('Aggression Freq flop/4th'))
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                'a1=%3.1f'     % (0) + '%',
+                'a1=NA',
-                'a_fq_1=%3.1f' % (0) + '%',
+                'a_fq_1=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('Aggression Freq flop/4th'))
     
 def a_freq2(stat_dict, player):
@@ -505,17 +510,17 @@ def a_freq2(stat_dict, player):
     try:
         stat = float(stat_dict[player]['aggr_2'])/float(stat_dict[player]['saw_2'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'             % (100.0*stat),
-                'a2=%3.1f'     % (100*stat) + '%',
+                'a2=%3.1f%%'        % (100.0*stat),
-                'a_fq_2=%3.1f'  % (100*stat) + '%',
+                'a_fq_2=%3.1f%%'    % (100.0*stat),
                 '(%d/%d)'           % (stat_dict[player]['aggr_2'], stat_dict[player]['saw_2']),
                 _('Aggression Freq turn/5th'))
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                'a2=%3.1f'     % (0) + '%',
+                'a2=NA',
-                'a_fq_2=%3.1f' % (0) + '%',
+                'a_fq_2=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('Aggression Freq turn/5th'))
     
 def a_freq3(stat_dict, player):
@@ -524,17 +529,17 @@ def a_freq3(stat_dict, player):
     try:
         stat = float(stat_dict[player]['aggr_3'])/float(stat_dict[player]['saw_3'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'             % (100.0*stat),
-                'a3=%3.1f'     % (100*stat) + '%',
+                'a3=%3.1f%%'        % (100.0*stat),
-                'a_fq_3=%3.1f'  % (100*stat) + '%',
+                'a_fq_3=%3.1f%%'    % (100.0*stat),
                 '(%d/%d)'      % (stat_dict[player]['aggr_3'], stat_dict[player]['saw_3']),
                 _('Aggression Freq river/6th'))
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                'a3=%3.1f'     % (0) + '%',
+                'a3=NA',
-                'a_fq_3=%3.1f' % (0) + '%',
+                'a_fq_3=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('Aggression Freq river/6th'))
     
 def a_freq4(stat_dict, player):
@@ -543,17 +548,17 @@ def a_freq4(stat_dict, player):
     try:
         stat = float(stat_dict[player]['aggr_4'])/float(stat_dict[player]['saw_4'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'             % (100.0*stat),
-                'a4=%3.1f'     % (100*stat) + '%',
+                'a4=%3.1f%%'        % (100.0*stat),
-                'a_fq_4=%3.1f'  % (100*stat) + '%',
+                'a_fq_4=%3.1f%%'    % (100.0*stat),
                 '(%d/%d)'           % (stat_dict[player]['aggr_4'], stat_dict[player]['saw_4']),
                 _('Aggression Freq 7th'))
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                'a4=%3.1f'     % (0) + '%',
+                'a4=NA',
-                'a_fq_4=%3.1f' % (0) + '%',
+                'a_fq_4=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('Aggression Freq 7th'))
 
 def a_freq_123(stat_dict, player):
@@ -563,9 +568,9 @@ def a_freq_123(stat_dict, player):
         stat = float(  stat_dict[player]['aggr_1'] + stat_dict[player]['aggr_2'] + stat_dict[player]['aggr_3']
                     ) / float(  stat_dict[player]['saw_1'] + stat_dict[player]['saw_2'] + stat_dict[player]['saw_3']);
         return (stat,
-                '%3.1f'             % (100*stat) + '%',
+                '%3.1f'                 % (100.0*stat),
-                'afq=%3.1f'         % (100*stat) + '%',
+                'afq=%3.1f%%'           % (100.0*stat),
-                'postf_aggfq=%3.1f' % (100*stat) + '%',
+                'postf_aggfq=%3.1f%%'   % (100.0*stat),
                 '(%d/%d)'           % (  stat_dict[player]['aggr_1']
                                        + stat_dict[player]['aggr_2']
                                        + stat_dict[player]['aggr_3']
@@ -576,10 +581,10 @@ def a_freq_123(stat_dict, player):
                 _('Post-Flop Aggression Freq'))
     except:
         return (stat,
-                '%2.0f'        % (0) + '%',
+                'NA',
-                'a3=%2.0f'     % (0) + '%',
+                'a3=NA',
-                'a_fq_3=%2.0f' % (0) + '%',
+                'a_fq_3=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('Post-Flop Aggression Freq'))
 
 def agg_freq(stat_dict, player):
@@ -597,17 +602,17 @@ def agg_freq(stat_dict, player):
         stat = float (bet_raise) / float(post_call + post_fold + bet_raise)
 
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'             % (100.0*stat),
-                'afr=%3.1f'    % (100*stat) + '%',
+                'afr=%3.1f%%'       % (100.0*stat),
-                'agg_fr=%3.1f' % (100*stat) + '%',
+                'agg_fr=%3.1f%%'    % (100.0*stat),
                 '(%d/%d)'           % (bet_raise, (post_call + post_fold + bet_raise)),
                 _('Aggression Freq'))
     except:
         return (stat,
-                '%2.1f'        % (0) + '%',
+                'NA',
-                'af=%3.1f'     % (0) + '%',
+                'af=NA',
-                'agg_f=%3.1f'  % (0) + '%',
+                'agg_f=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('Aggression Freq'))
 
 def agg_fact(stat_dict, player):
@@ -630,10 +635,10 @@ def agg_fact(stat_dict, player):
                 _('Aggression Factor'))
     except:
         return (stat,
-                '%2.2f'        % (0) ,
+                'NA',
-                'afa=%2.2f'    % (0) ,
+                'afa=NA',
-                'agg_fa=%2.2f' % (0),
+                'agg_fa=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('Aggression Factor'))
 
 def cbet(stat_dict, player):
@@ -647,17 +652,17 @@ def cbet(stat_dict, player):
         oppt = stat_dict[player]['cb_opp_1']+stat_dict[player]['cb_opp_2']+stat_dict[player]['cb_opp_3']+stat_dict[player]['cb_opp_4']
         stat = float(cbets)/float(oppt)
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'cbet=%3.1f'   % (100*stat) + '%',
+                'cbet=%3.1f%%'  % (100.0*stat),
-                'cbet=%3.1f'   % (100*stat) + '%',
+                'cbet=%3.1f%%'  % (100.0*stat),
                 '(%d/%d)'       % (cbets, oppt),
                 _('% continuation bet '))
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                'cbet=%3.1f'   % (0) + '%',
+                'cbet=NA',
-                'cbet=%3.1f'   % (0) + '%',
+                'cbet=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('% continuation bet '))
     
 def cb1(stat_dict, player):
@@ -666,17 +671,17 @@ def cb1(stat_dict, player):
     try:
         stat = float(stat_dict[player]['cb_1'])/float(stat_dict[player]['cb_opp_1'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'cb1=%3.1f'     % (100*stat) + '%',
+                'cb1=%3.1f%%'   % (100.0*stat),
-                'cb_1=%3.1f'  % (100*stat) + '%',
+                'cb_1=%3.1f%%'  % (100.0*stat),
                 '(%d/%d)'       % (stat_dict[player]['cb_1'], stat_dict[player]['cb_opp_1']),
                 _('% continuation bet flop/4th'))
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                'cb1=%3.1f'     % (0) + '%',
+                'cb1=NA',
-                'cb_1=%3.1f' % (0) + '%',
+                'cb_1=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('% continuation bet flop/4th'))
     
 def cb2(stat_dict, player):
@@ -685,17 +690,17 @@ def cb2(stat_dict, player):
     try:
         stat = float(stat_dict[player]['cb_2'])/float(stat_dict[player]['cb_opp_2'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'cb2=%3.1f'     % (100*stat) + '%',
+                'cb2=%3.1f%%'   % (100.0*stat),
-                'cb_2=%3.1f'  % (100*stat) + '%',
+                'cb_2=%3.1f%%'  % (100.0*stat),
                 '(%d/%d)'       % (stat_dict[player]['cb_2'], stat_dict[player]['cb_opp_2']),
                 _('% continuation bet turn/5th'))
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                'cb2=%3.1f'     % (0) + '%',
+                'cb2=NA',
-                'cb_2=%3.1f' % (0) + '%',
+                'cb_2=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('% continuation bet turn/5th'))
     
 def cb3(stat_dict, player):
@@ -704,17 +709,17 @@ def cb3(stat_dict, player):
     try:
         stat = float(stat_dict[player]['cb_3'])/float(stat_dict[player]['cb_opp_3'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'cb3=%3.1f'     % (100*stat) + '%',
+                'cb3=%3.1f%%'   % (100.0*stat),
-                'cb_3=%3.1f'  % (100*stat) + '%',
+                'cb_3=%3.1f%%'  % (100.0*stat),
                 '(%d/%d)'       % (stat_dict[player]['cb_3'], stat_dict[player]['cb_opp_3']),
                 _('% continuation bet river/6th'))
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                'cb3=%3.1f'     % (0) + '%',
+                'cb3=NA',
-                'cb_3=%3.1f' % (0) + '%',
+                'cb_3=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('% continuation bet river/6th'))
     
 def cb4(stat_dict, player):
@@ -723,17 +728,17 @@ def cb4(stat_dict, player):
     try:
         stat = float(stat_dict[player]['cb_4'])/float(stat_dict[player]['cb_opp_4'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'cb4=%3.1f'     % (100*stat) + '%',
+                'cb4=%3.1f%%'   % (100.0*stat),
-                'cb_4=%3.1f'  % (100*stat) + '%',
+                'cb_4=%3.1f%%'  % (100.0*stat),
                 '(%d/%d)'      % (stat_dict[player]['cb_4'], stat_dict[player]['cb_opp_4']),
                 _('% continuation bet 7th'))
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                'cb4=%3.1f'     % (0) + '%',
+                'cb4=NA',
-                'cb_4=%3.1f' % (0) + '%',
+                'cb_4=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('% continuation bet 7th'))
     
 def ffreq1(stat_dict, player):
@@ -742,9 +747,9 @@ def ffreq1(stat_dict, player):
     try:
         stat = float(stat_dict[player]['f_freq_1'])/float(stat_dict[player]['was_raised_1'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'ff1=%3.1f'     % (100*stat) + '%',
+                'ff1=%3.1f%%'   % (100.0*stat),
-                'ff_1=%3.1f'  % (100*stat) + '%',
+                'ff_1=%3.1f%%'  % (100.0*stat),
                 '(%d/%d)'       % (stat_dict[player]['f_freq_1'], stat_dict[player]['was_raised_1']),
                 _('% fold frequency flop/4th'))
     except:
@@ -761,17 +766,17 @@ def ffreq2(stat_dict, player):
     try:
         stat = float(stat_dict[player]['f_freq_2'])/float(stat_dict[player]['was_raised_2'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'ff2=%3.1f'     % (100*stat) + '%',
+                'ff2=%3.1f%%'   % (100.0*stat),
-                'ff_2=%3.1f'  % (100*stat) + '%',
+                'ff_2=%3.1f%%'  % (100.0*stat),
                 '(%d/%d)'       % (stat_dict[player]['f_freq_2'], stat_dict[player]['was_raised_2']),
                 _('% fold frequency turn/5th'))
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                'ff2=%3.1f'     % (0) + '%',
+                'ff2=NA',
-                'ff_2=%3.1f' % (0) + '%',
+                'ff_2=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('% fold frequency turn/5th'))
     
 def ffreq3(stat_dict, player):
@@ -780,17 +785,17 @@ def ffreq3(stat_dict, player):
     try:
         stat = float(stat_dict[player]['f_freq_3'])/float(stat_dict[player]['was_raised_3'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'ff3=%3.1f'     % (100*stat) + '%',
+                'ff3=%3.1f%%'   % (100.0*stat),
-                'ff_3=%3.1f'  % (100*stat) + '%',
+                'ff_3=%3.1f%%'  % (100.0*stat),
                 '(%d/%d)'       % (stat_dict[player]['f_freq_3'], stat_dict[player]['was_raised_3']),
                 _('% fold frequency river/6th'))
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                'ff3=%3.1f'     % (0) + '%',
+                'ff3=NA',
-                'ff_3=%3.1f' % (0) + '%',
+                'ff_3=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('% fold frequency river/6th'))
     
 def ffreq4(stat_dict, player):
@@ -799,24 +804,24 @@ def ffreq4(stat_dict, player):
     try:
         stat = float(stat_dict[player]['f_freq_4'])/float(stat_dict[player]['was_raised_4'])
         return (stat,
-                '%3.1f'        % (100*stat) + '%',
+                '%3.1f'         % (100.0*stat),
-                'ff4=%3.1f'     % (100*stat) + '%',
+                'ff4=%3.1f%%'   % (100.0*stat),
-                'ff_4=%3.1f'  % (100*stat) + '%',
+                'ff_4=%3.1f%%'  % (100.0*stat),
                 '(%d/%d)'       % (stat_dict[player]['f_freq_4'], stat_dict[player]['was_raised_4']),
                 _('% fold frequency 7th'))
     except:
         return (stat,
-                '%3.1f'        % (0) + '%',
+                'NA',
-                'ff4=%3.1f'     % (0) + '%',
+                'ff4=NA',
-                'ff_4=%3.1f' % (0) + '%',
+                'ff_4=NA',
-                '(%d/%d)'      % (0, 0),
+                '(0/0)',
                 _('% fold frequency 7th'))
     
 if __name__== "__main__":
     statlist = dir()
     misslist = [ "Configuration", "Database", "Charset", "codecs", "encoder"
                , "do_stat", "do_tip", "GInitiallyUnowned", "gtk", "pygtk"
-               , "re", "re_Percent", "re_Places"
+               , "re", "re_Places"
                ]
     statlist = [ x for x in statlist if x not in dir(sys) ]
     statlist = [ x for x in statlist if x not in dir(codecs) ]

pyfpdb/Tables.py

@@ -1,449 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""Discover_Tables.py
-
-Inspects the currently open windows and finds those of interest to us--that is
-poker table windows from supported sites.  Returns a list
-of Table_Window objects representing the windows found.
-"""
-#    Copyright 2008-2010, Ray E. Barker
-
-#    This program is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#    
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#    GNU General Public License for more details.
-#    
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-########################################################################
-
-#    Standard Library modules
-import os
-import sys
-import re
-
-import locale
-lang=locale.getdefaultlocale()[0][0:2]
-if lang=="en":
-    def _(string): return string
-else:
-    import gettext
-    try:
-        trans = gettext.translation("fpdb", localedir="locale", languages=[lang])
-        trans.install()
-    except IOError:
-        def _(string): return string
-
-#    Win32 modules
-if os.name == 'nt':
-    import win32gui
-    import win32process
-    import win32api
-    import win32con
-    import win32security
-
-#    FreePokerTools modules
-import Configuration
-
-#    Each TableWindow object must have the following attributes correctly populated:
-#    tw.name = the table name from the title bar, which must to match the table name
-#              from the corresponding hand history.
-#    tw.site = the site name, e.g. PokerStars, FullTilt.  This must match the site
-#            name specified in the config file.
-#    tw.number = This is the system id number for the client table window in the 
-#                format that the system presents it.  This is Xid in Xwindows and
-#                hwnd in Microsoft Windows.
-#    tw.title = The full title from the window title bar.
-#    tw.width, tw.height = The width and height of the window in pixels.  This is 
-#            the internal width and height, not including the title bar and 
-#            window borders.
-#    tw.x, tw.y = The x, y (horizontal, vertical) location of the window relative 
-#            to the top left of the display screen.  This also does not include the
-#            title bar and window borders.  To put it another way, this is the 
-#            screen location of (0, 0) in the working window.
-
-class Table_Window:
-    def __init__(self, info = {}):
-        if 'number' in info:    self.number = info['number']
-        if 'exe' in info:       self.exe    = info['exe']
-        if 'width' in info:     self.width  = info['width']
-        if 'height' in info:    self.height = info['height']
-        if 'x' in info:         self.x      = info['x']
-        if 'y' in info:         self.y      = info['y']
-        if 'site' in info:      self.site   = info['site']
-        if 'title' in info:     self.title  = info['title']
-        if 'name' in info:      self.name   = info['name']
-        self.gdkhandle = None
-
-    def __str__(self):
-#    __str__ method for testing
-        temp = 'TableWindow object\n'
-        temp = temp + "    name = %s\n    site = %s\n    number = %s\n    title = %s\n" % (self.name, self.site, self.number, self.title)
-#        temp = temp + "    game = %s\n    structure = %s\n    max = %s\n" % (self.game, self.structure, self.max)
-        temp = temp + "    width = %d\n    height = %d\n    x = %d\n    y = %d\n" % (self.width, self.height, self.x, self.y)
-        if getattr(self, 'tournament', 0):
-            temp = temp + "    tournament = %d\n    table = %d" % (self.tournament, self.table)
-        return temp
-
-############################################################################
-#    Top-level discovery routines--these are the modules interface
-def discover(c):
-    """Dispatch routine for finding all potential poker client windows."""
-    if os.name == 'posix':
-        tables = discover_posix(c)
-    elif os.name == 'nt':
-        tables = discover_nt(c)
-    elif os.name == 'mac':
-        tables = discover_mac(c)
-    else:
-        tables = {}
-    return tables
-
-def discover_table_by_name(c, tablename):
-    """Dispatch routine for finding poker client windows with the given name."""
-    if os.name == 'posix':
-        info = discover_posix_by_name(c, tablename)
-    elif os.name == 'nt':
-        info = discover_nt_by_name(c, tablename)
-    elif os.name == 'mac':
-        info = discover_mac_by_name(c, tablename)
-    else:
-        return None
-    if info is None:
-        return None
-    return Table_Window(info)
-
-def discover_tournament_table(c, tour_number, tab_number):
-    """Dispatch routine for finding poker clients with tour and table number."""
-    if os.name == 'posix':
-        info = discover_posix_tournament(c, tour_number, tab_number)
-    elif os.name == 'nt':
-        info = discover_nt_tournament(c, tour_number, tab_number)
-    elif os.name == 'mac':
-        info = discover_mac_tournament(c, tour_number, tab_number)
-    else:
-        return None
-    if info:
-        return Table_Window(info)
-    return None
-
-#############################################################################
-# Posix (= XWindows) specific routines
-def discover_posix(c):
-    """Poker client table window finder for posix/Linux = XWindows."""
-    tables = {}
-    for listing in os.popen('xwininfo -root -tree').readlines():
-#    xwininfo -root -tree -id 0xnnnnn    gets the info on a single window
-        for s in c.get_supported_sites():
-            params = c.get_site_parameters(s)
-            
-# TODO: We need to make a list of phrases, shared between the WIndows and Unix code!!!!!!       
-            if re.search(params['table_finder'], listing):
-                if 'Lobby' in listing:   continue
-                if 'Instant Hand History' in listing: continue
-#                if '\"Full Tilt Poker\"' in listing: continue
-                if 'History for table:' in listing: continue
-                if 'has no name' in listing: continue
-                info = decode_xwininfo(c, listing)
-                if info['site'] is None:                       continue
-                if info['title'] == info['exe']:               continue
-#    this appears to be a poker client, so make a table object for it
-                tw = Table_Window(info)
-                eval("%s(tw)" % params['decoder'])
-                tables[tw.name] = tw
-    return tables
-
-def discover_posix_by_name(c, tablename):
-    """Find an XWindows poker client of the given name."""
-    for listing in os.popen('xwininfo -root -tree').readlines():
-        if tablename in listing:
-            if 'History for table:' in listing: continue
-            info = decode_xwininfo(c, listing)
-            if not info['name'] == tablename:            continue
-            return info
-    return None
-
-def discover_posix_tournament(c, t_number, s_number):
-    """Finds the X window for a client, given tournament and table nos."""
-    search_string = "%s.+Table.+%s" % (t_number, s_number)
-    for listing in os.popen('xwininfo -root -tree').readlines():
-        if re.search(search_string, listing):
-            return decode_xwininfo(c, listing)
-    return None
-
-def decode_xwininfo(c, info_string):
-    """Gets window parameters from xwinifo string--XWindows."""
-    info = {}
-    mo = re.match('\s+([\dxabcdef]+) (.+):\s\(\"([a-zA-Z.]+)\".+  (\d+)x(\d+)\+\d+\+\d+  \+(\d+)\+(\d+)', info_string)
-    if not mo:
-        return None
-    else:
-        info['number'] = int( mo.group(1), 0)
-        info['exe']    = mo.group(3)
-        info['width']  = int( mo.group(4) )
-        info['height'] = int( mo.group(5) )
-        info['x']      = int( mo.group(6) )
-        info['y']      = int( mo.group(7) )
-        info['site']   = get_site_from_exe(c, info['exe'])
-        info['title']  = re.sub('\"', '', mo.group(2))
-        title_bits     = re.split(' - ', info['title'])
-        info['name']   = clean_title(title_bits[0])
-    return info
-
-##############################################################################
-#    NT (= Windows) specific routines
-def discover_nt(c):
-    """    Poker client table window finder for Windows."""
-#
-#    I cannot figure out how to get the inside dimensions of the poker table
-#    windows.  So I just assume all borders are 3 thick and all title bars
-#    are 29 high.  No doubt this will be off when used with certain themes.
-#
-    b_width = 3
-    tb_height = 29
-    titles = {}
-    tables = {}
-    win32gui.EnumWindows(win_enum_handler, titles)
-    for hwnd in titles:
-        if 'Logged In as' in titles[hwnd] and not 'Lobby' in titles[hwnd]:
-            if 'Full Tilt Poker' in titles[hwnd]:
-                continue
-            tw = Table_Window()
-            tw.number = hwnd
-            (x, y, width, height) = win32gui.GetWindowRect(hwnd)
-            tw.title  = titles[hwnd]
-            tw.width  = int( width ) - 2*b_width
-            tw.height = int( height ) - b_width - tb_height
-            tw.x      = int( x ) + b_width
-            tw.y      = int( y ) + tb_height
-            
-# TODO: Isn't the site being determined by the EXE name it belongs to? is this section of code even useful? cleaning it anyway
-            if 'Logged In as' in titles[hwnd]:
-                tw.site = "PokerStars"
-            elif 'Logged In As' in titles[hwnd]:
-                tw.site = "Full Tilt"
-            else:
-                tw.site = "Unknown"
-                sys.stderr.write(_("Found unknown table = %s") % tw.title)
-            if tw.site != "Unknown":
-                eval("%s(tw)" % c.supported_sites[tw.site].decoder)
-            else:
-                tw.name = "Unknown"
-            tables[len(tables)] = tw
-    return tables
-
-def discover_nt_by_name(c, tablename):
-    """Finds poker client window with the given table name."""
-    titles = {}
-    win32gui.EnumWindows(win_enum_handler, titles)
-        
-    for hwnd in titles:
-        #print "Tables.py: tablename =", tablename, "title =", titles[hwnd]
-        try:
-            # maybe it's better to make global titles[hwnd] decoding?
-            # this can blow up in XP on some windows, eg firefox displaying http://docs.python.org/tutorial/classes.html
-            if not tablename.lower() in titles[hwnd].decode(Configuration.LOCALE_ENCODING).lower():
-                continue
-        except:
-            continue
-        if 'History for table:' in titles[hwnd]: continue # Everleaf Network HH viewer window
-        if 'HUD:' in titles[hwnd]: continue # FPDB HUD window
-        if 'Chat:' in titles[hwnd]: continue # Some sites (FTP? PS? Others?) have seperable or seperately constructed chat windows
-        if ' - Table ' in titles[hwnd]: continue # Absolute table Chat window.. sigh. TODO: Can we tell what site we're trying to discover for somehow in here, so i can limit this check just to AP searches?
-        temp = decode_windows(c, titles[hwnd], hwnd)
-        print _("attach to window"), temp
-        return temp
-    return None
-
-def discover_nt_tournament(c, tour_number, tab_number):
-    """Finds the Windows window handle for the given tournament/table."""
-    search_string = "%s.+%s" % (tour_number, tab_number)
-
-    titles ={}
-    win32gui.EnumWindows(win_enum_handler, titles)
-    for hwnd in titles:
-        # Some sites (FTP? PS? Others?) have seperable or seperately constructed chat windows
-        if 'Chat:' in titles[hwnd]: continue
-        # Everleaf Network HH viewer window
-        if 'History for table:' in titles[hwnd]: continue
-        # FPDB HUD window
-        if 'HUD:' in titles[hwnd]: continue
-
-        if re.search(search_string, titles[hwnd]):
-            return decode_windows(c, titles[hwnd], hwnd)
-    return None
-
-def get_nt_exe(hwnd):
-    """Finds the name of the executable that the given window handle belongs to."""
-    
-    # Request privileges to enable "debug process", so we can later use
-    # PROCESS_VM_READ, retardedly required to GetModuleFileNameEx()
-    priv_flags = win32security.TOKEN_ADJUST_PRIVILEGES | win32security.TOKEN_QUERY
-    hToken = win32security.OpenProcessToken (win32api.GetCurrentProcess(),
-                                             priv_flags)
-    # enable "debug process"
-    privilege_id = win32security.LookupPrivilegeValue(None,
-                                                      win32security.SE_DEBUG_NAME)
-    old_privs = win32security.AdjustTokenPrivileges(hToken, 0,
-                                                    [(privilege_id,
-                                                      win32security.SE_PRIVILEGE_ENABLED)])
-    
-    # Open the process, and query it's filename
-    processid = win32process.GetWindowThreadProcessId(hwnd)
-    pshandle = win32api.OpenProcess(win32con.PROCESS_QUERY_INFORMATION |
-                                    win32con.PROCESS_VM_READ, False,
-                                    processid[1])
-    try:
-        exename = win32process.GetModuleFileNameEx(pshandle, 0)
-    except pywintypes.error:
-        # insert code to call GetProcessImageName if we can find it..
-        # returning None from here will hopefully break all following code
-        exename = None 
-    finally:
-        # clean up
-        win32api.CloseHandle(pshandle)
-        win32api.CloseHandle(hToken)
-        
-    return exename
-
-def decode_windows(c, title, hwnd):
-    """Gets window parameters from the window title and handle--Windows."""
-
-#    I cannot figure out how to get the inside dimensions of the poker table
-#    windows.  So I just assume all borders are 3 thick and all title bars
-#    are 29 high.  No doubt this will be off when used with certain themes.
-    b_width = 3
-    tb_height = 29
-
-    info = {}
-    info['number'] = hwnd
-    info['title'] = re.sub('\"', '', title)
-    (x, y, width, height) = win32gui.GetWindowRect(hwnd)
-
-    info['x']      = int(x)  + b_width
-    info['y']      = int( y ) + tb_height
-    info['width']  = int( width ) - 2*b_width
-    info['height'] = int( height ) - b_width - tb_height
-    info['exe']    = get_nt_exe(hwnd)
-    print "get_nt_exe returned ", info['exe']
-    # TODO: 'width' here is all sorts of screwed up.
-
-    title_bits = re.split(' - ', info['title'])
-    info['name'] = title_bits[0]
-    info['site']   = get_site_from_exe(c, info['exe'])
-
-    return info
-
-def win_enum_handler(hwnd, titles):
-    str = win32gui.GetWindowText(hwnd)
-    if str != "":
-        titles[hwnd] = win32gui.GetWindowText(hwnd)
-  
-###################################################################
-#    Utility routines used by all the discoverers.
-def get_site_from_exe(c, exe):
-    """Look up the site from config, given the exe."""
-    for s in c.get_supported_sites():
-        params = c.get_site_parameters(s)
-        if re.search(params['table_finder'], exe):
-            return params['site_name']
-    return None
-
-def everleaf_decode_table(tw):
-# 2 - Tournament ID: 573256 - NL Hold'em - 150/300 blinds - Good luck <username>! - [Connection is ...]    
-    pass
-
-def pokerstars_decode_table(tw):
-#    Extract poker information from the window title.  This is not needed for
-#    fpdb, since all that information is available in the db via new_hand_number.
-#    This is needed only when using the HUD with a backend less integrated.
-    title_bits = re.split(' - ', tw.title)
-    name = title_bits[0]
-    mo = re.search('Tournament (\d+) Table (\d+)', name)
-    if mo:
-        tw.tournament = int( mo.group(1) )
-        tw.table      = int( mo.group(2) )
-        tw.name       = name
-    else:
-        tw.tournament = None
-        tw.name = clean_title(name)
-    mo = re.search('(Razz|Stud H/L|Stud|Omaha H/L|Omaha|Hold\'em|5-Card Draw|Triple Draw 2-7 Lowball|Badugi)', tw.title)
-    
-    tw.game = mo.group(1).lower()
-    tw.game = re.sub('\'', '', tw.game)
-    tw.game = re.sub('h/l', 'hi/lo', tw.game)
-    
-    mo = re.search('(No Limit|Pot Limit)', tw.title)
-    if mo:
-        tw.structure = mo.group(1).lower()
-    else:
-        tw.structure = 'limit'
-        
-    tw.max = None
-    if tw.game in ('razz', 'stud', 'stud hi/lo'):
-        tw.max = 8
-    elif tw.game in ('5-card draw', 'triple draw 2-7 lowball'):
-        tw.max = 6
-    elif tw.game == 'holdem':
-        pass
-    elif tw.game in ('omaha', 'omaha hi/lo'):
-        pass
-
-def fulltilt_decode_table(tw):
-#    Extract poker information from the window title.  This is not needed for
-#    fpdb, since all that information is available in the db via new_hand_number.
-#    This is needed only when using the HUD with a backend less integrated.
-    title_bits = re.split(' - ', tw.title)
-    name = title_bits[0]
-    tw.tournament = None
-    tw.name = clean_title(name)
-
-def clean_title(name):
-    """Clean the little info strings from the table name."""
-#    these strings could go in a config file
-    for pattern in [' \(6 max\)', ' \(heads up\)', ' \(deep\)',
-                ' \(deep hu\)', ' \(deep 6\)', '\(6 max, deep\)', ' \(2\)',
-                ' \(edu\)', ' \(edu, 6 max\)', ' \(6\)',
-                ' \(speed\)', 'special', 'newVPP', 
-                ' no all-in', ' fast', ',', ' 50BB min', '50bb min', '\s+$']:
-        name = re.sub(pattern, '', name)
-    name = name.rstrip()
-    return name
-
-###########################################################################
-#    Mac specific routines....all stubs for now
-def discover_mac_tournament(c, tour_number, tab_number):
-    """Mac users need help."""
-    return None
-
-def discover_mac(c):
-    """Poker client table window finder for Macintosh."""
-    tables = {}
-    return tables
-
-def discover_mac_by_name(c, tablename):
-    """Oh, the humanity."""
-    # again, i have no mac to test this on, sorry -eric
-    return None
-
-###########################################################################
-#   Main function used for testing
-if __name__=="__main__":
-    c = Configuration.Config()
-
-    print discover_table_by_name(c, "Torino")
-#    print discover_tournament_table(c, "118942908", "3")
-
-    tables = discover(c)
-    for t in tables.keys():
-        print tables[t]
-
-    print _("press enter to continue")
-    sys.stdin.readline()

pyfpdb/TestHandsPlayers.py

@@ -1,4 +1,23 @@
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
+#
+#    Copyright 2010, Carl Gherardi
+#    
+#    This program is free software; you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation; either version 2 of the License, or
+#    (at your option) any later version.
+#    
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#    GNU General Public License for more details.
+#    
+#    You should have received a copy of the GNU General Public License
+#    along with this program; if not, write to the Free Software
+#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+########################################################################
+
 import sys
 import os
 import codecs
@@ -12,7 +31,8 @@ import fpdb_import
 
 
 class FpdbError:
-    def __init__(self):
+    def __init__(self, sitename):
+        self.site = sitename
         self.errorcount = 0
         self.histogram = {}
 
@@ -28,18 +48,19 @@ class FpdbError:
         self.errorcount += 1
 
     def print_histogram(self):
+        print "%s:" % self.site
         for f in self.histogram:
             idx = f.find('regression')
             print "(%3d) : %s" %(self.histogram[f], f[idx:])
 
-def compare(leaf, importer, errors):
+def compare(leaf, importer, errors, site):
     filename = leaf
     #print "DEBUG: fileanme: %s" % filename
 
     # Test if this is a hand history file
     if filename.endswith('.txt'):
         # test if there is a .hp version of the file
-        importer.addBulkImportImportFileOrDir(filename, site="PokerStars")
+        importer.addBulkImportImportFileOrDir(filename, site=site)
         (stored, dups, partial, errs, ttime) = importer.runImport()
         if os.path.isfile(filename + '.hp'):
             # Compare them
@@ -74,15 +95,15 @@ def compare(leaf, importer, errors):
 
 
 
-def walk_testfiles(dir, function, importer, errors):
+def walk_testfiles(dir, function, importer, errors, site):
     """Walks a directory, and executes a callback on each file """
     dir = os.path.abspath(dir)
     for file in [file for file in os.listdir(dir) if not file in [".",".."]]:
         nfile = os.path.join(dir,file)
         if os.path.isdir(nfile):
-            walk_testfiles(nfile, compare, importer, errors)
+            walk_testfiles(nfile, compare, importer, errors, site)
         else:
-            compare(nfile, importer, errors)
+            compare(nfile, importer, errors, site)
 
 def main(argv=None):
     if argv is None:
@@ -103,14 +124,25 @@ def main(argv=None):
     importer.setCallHud(False)
     importer.setFakeCacheHHC(True)
 
-    errors = FpdbError()
+    PokerStarsErrors = FpdbError('PokerStars')
+    FTPErrors        = FpdbError('Full Tilt Poker')
+    PartyPokerErrors = FpdbError('Party Poker')
+    BetfairErrors    = FpdbError('Betfair')
     
-    walk_testfiles("regression-test-files/cash/Stars/", compare, importer, errors)
+    walk_testfiles("regression-test-files/cash/Stars/", compare, importer, PokerStarsErrors, "PokerStars")
+    walk_testfiles("regression-test-files/cash/FTP/", compare, importer, FTPErrors, "Full Tilt Poker")
+    #walk_testfiles("regression-test-files/cash/PartyPoker/", compare, importer, PartyPokerErrors, "PartyPoker")
+    walk_testfiles("regression-test-files/cash/Betfair/", compare, importer, BetfairErrors, "Betfair")
+
+    totalerrors = PokerStarsErrors.errorcount + FTPErrors.errorcount + PartyPokerErrors.errorcount + BetfairErrors.errorcount
 
     print "---------------------"
-    print "Total Errors: %d" % errors.errorcount
+    print "Total Errors: %d" % totalerrors
     print "---------------------"
-    errors.print_histogram()
+    PokerStarsErrors.print_histogram()
+    FTPErrors.print_histogram()
+    PartyPokerErrors.print_histogram()
+    BetfairErrors.print_histogram()
 
 if __name__ == '__main__':
     sys.exit(main())

pyfpdb/UltimateBetToFpdb.py

@@ -39,7 +39,7 @@ in_path   (default '-' = sys.stdin)
 out_path  (default '-' = sys.stdout)
 follow :  whether to tail -f the input"""
         HandHistoryConverter.__init__(self, in_path, out_path, sitename="UltimateBet", follow=follow, index=index)
-        logging.info("Initialising UltimateBetconverter class")
+        logging.info(_("Initialising UltimateBetconverter class"))
         self.filetype = "text"
         self.codepage = "cp1252"
         self.siteId   = 6 # Needs to match id entry in Sites database
@@ -141,7 +141,7 @@ follow :  whether to tail -f the input"""
         if m:
             hand.buttonpos = int(m.group('BUTTON'))
         else:
-            logging.info('readButton: not found')
+            logging.info(_('readButton: not found'))
 
     def readPlayerStacks(self, hand):
         logging.debug("readPlayerStacks")
@@ -180,7 +180,7 @@ follow :  whether to tail -f the input"""
             hand.setCommunityCards(street, m.group('CARDS').split(' '))
 
     def readAntes(self, hand):
-        logging.debug("reading antes")
+        logging.debug(_("reading antes"))
         m = self.re_Antes.finditer(hand.handText)
         for player in m:
             #~ logging.debug("hand.addAnte(%s,%s)" %(player.group('PNAME'), player.group('ANTE')))
@@ -290,7 +290,7 @@ follow :  whether to tail -f the input"""
             #elif action.group('ATYPE') == ' stands pat':
             #    hand.addStandsPat( street, action.group('PNAME'))
             else:
-                print "DEBUG: unimplemented readAction: '%s' '%s'" %(action.group('PNAME'),action.group('ATYPE'),)
+                print _("DEBUG: unimplemented readAction: '%s' '%s'" %(action.group('PNAME'),action.group('ATYPE'),))
 
 
     def readShowdownActions(self, hand):
@@ -312,9 +312,9 @@ follow :  whether to tail -f the input"""
 
 if __name__ == "__main__":
     parser = OptionParser()
-    parser.add_option("-i", "--input", dest="ipath", help="parse input hand history", default="regression-test-files/pokerstars/HH20090226 Natalie V - $0.10-$0.20 - HORSE.txt")
+    parser.add_option("-i", "--input", dest="ipath", help=_("parse input hand history"), default="regression-test-files/pokerstars/HH20090226 Natalie V - $0.10-$0.20 - HORSE.txt")
-    parser.add_option("-o", "--output", dest="opath", help="output translation to", default="-")
+    parser.add_option("-o", "--output", dest="opath", help=_("output translation to"), default="-")
-    parser.add_option("-f", "--follow", dest="follow", help="follow (tail -f) the input", action="store_true", default=False)
+    parser.add_option("-f", "--follow", dest="follow", help=_("follow (tail -f) the input"), action="store_true", default=False)
     parser.add_option("-q", "--quiet",
                   action="store_const", const=logging.CRITICAL, dest="verbosity", default=logging.INFO)
     parser.add_option("-v", "--verbose",

pyfpdb/Win2dayToFpdb.py

@@ -153,7 +153,7 @@ class Win2day(HandHistoryConverter):
                     hand.buttonpos = player[0]
                     break
         else:
-            logging.info('readButton: not found')
+            logging.info(_('readButton: not found'))
 
     def readPlayerStacks(self, hand):
         logging.debug("readPlayerStacks")
@@ -194,7 +194,7 @@ class Win2day(HandHistoryConverter):
             hand.setCommunityCards(street, boardCards)
 
     def readAntes(self, hand):
-        logging.debug("reading antes")
+        logging.debug(_("reading antes"))
         m = self.re_Antes.finditer(hand.handText)
         for player in m:
             #~ logging.debug("hand.addAnte(%s,%s)" %(player.group('PNAME'), player.group('ANTE')))
@@ -332,7 +332,7 @@ class Win2day(HandHistoryConverter):
             elif action.group('ATYPE') == 'ACTION_STAND':
                 hand.addStandsPat( street, action.group('PNAME'))
             else:
-                print "DEBUG: unimplemented readAction: '%s' '%s'" %(action.group('PNAME'),action.group('ATYPE'),)
+                print _("DEBUG: unimplemented readAction: '%s' '%s'" %(action.group('PNAME'),action.group('ATYPE'),))
 
 
     def readShowdownActions(self, hand):
@@ -359,9 +359,9 @@ class Win2day(HandHistoryConverter):
 
 if __name__ == "__main__":
     parser = OptionParser()
-    parser.add_option("-i", "--input", dest="ipath", help="parse input hand history", default="-")
+    parser.add_option("-i", "--input", dest="ipath", help=_("parse input hand history"), default="-")
-    parser.add_option("-o", "--output", dest="opath", help="output translation to", default="-")
+    parser.add_option("-o", "--output", dest="opath", help=_("output translation to"), default="-")
-    parser.add_option("-f", "--follow", dest="follow", help="follow (tail -f) the input", action="store_true", default=False)
+    parser.add_option("-f", "--follow", dest="follow", help=_("follow (tail -f) the input"), action="store_true", default=False)
     parser.add_option("-q", "--quiet",
                   action="store_const", const=logging.CRITICAL, dest="verbosity", default=logging.INFO)
     parser.add_option("-v", "--verbose",

pyfpdb/fpdb.pyw

@@ -52,7 +52,7 @@ if os.name == 'nt' and sys.version[0:3] not in ('2.5', '2.6', '2.7') and '-r' no
         else:
             os.execvpe('python', ('python', 'fpdb.pyw', '-r'), os.environ) # first arg is ignored (name of program being run)
     else:
-        print _("\npython 2.5 not found, please install python 2.5, 2.6 or 2.7 for fpdb\n")
+        print _("\npython 2.5-2.7 not found, please install python 2.5, 2.6 or 2.7 for fpdb\n")
         raw_input(_("Press ENTER to continue."))
         exit()
 else:
@@ -86,7 +86,7 @@ try:
     import gtk
     import pango
 except:
-    print _("Unable to load PYGTK modules required for GUI. Please install PyCairo, PyGObject, and PyGTK from www.pygtk.org.")
+    print _("Unable to load PyGTK modules required for GUI. Please install PyCairo, PyGObject, and PyGTK from www.pygtk.org.")
     raw_input(_("Press ENTER to continue."))
     exit()
 
@@ -129,7 +129,7 @@ import Configuration
 import Exceptions
 import Stats
 
-VERSION = "0.20.906"
+VERSION = "0.20.906 plus git"
 
 
 class fpdb:
@@ -436,7 +436,7 @@ class fpdb:
         diaHudTable.vbox.add(label)
         label.show()
         
-        label=gtk.Label(_("To configure things like colouring you will still have to manually edit your HUD_config.xml."))
+        label=gtk.Label(_("To configure things like colouring you will still have to use the Preferences dialogue or manually edit your HUD_config.xml."))
         diaHudTable.vbox.add(label)
         label.show()
         
@@ -544,8 +544,9 @@ class fpdb:
             #lock_released = False
             dia_confirm = gtk.MessageDialog(parent=self.window, flags=gtk.DIALOG_DESTROY_WITH_PARENT, type=gtk.MESSAGE_WARNING,
                     buttons=(gtk.BUTTONS_YES_NO), message_format=_("Confirm deleting and recreating tables"))
-            diastring = _("Please confirm that you want to (re-)create the tables. If there already are tables in the database ") \
+            diastring = _("Please confirm that you want to (re-)create the tables.") \
-                        +self.db.database+" on "+self.db.host+_(" they will be deleted.\nThis may take a while.")
+                        + (_(" If there already are tables in the database %s on %s they will be deleted and you will have to re-import your histories.\n") % (self.db.database, self.db.host)) \
+                        + _("This may take a while.")
             dia_confirm.format_secondary_text(diastring)#todo: make above string with bold for db, host and deleted
             # disable windowclose, do not want the the underlying processing interrupted mid-process
             dia_confirm.set_deletable(False)
@@ -755,24 +756,6 @@ class fpdb:
     def dia_save_profile(self, widget, data=None):
         self.warning_box(_("Unimplemented: Save Profile (try saving a HUD layout, that should do it)"))
 
-    def diaSetupWizard(self, path):
-        diaSetupWizard = gtk.Dialog(title=_("Fatal Error - Config File Missing"), parent=None, flags=0, buttons=(gtk.STOCK_QUIT,gtk.RESPONSE_OK))
-
-        label = gtk.Label(_("Please copy the config file from the docs folder to:"))
-        diaSetupWizard.vbox.add(label)
-        label.show()
-
-        label = gtk.Label(path)
-        diaSetupWizard.vbox.add(label)
-        label.show()
-
-        label = gtk.Label(_("and edit it according to the install documentation at http://fpdb.sourceforge.net"))
-        diaSetupWizard.vbox.add(label)
-        label.show()
-
-        response = diaSetupWizard.run()
-        sys.exit(1)
-
     def get_menu(self, window):
         """returns the menu for this program"""
         fpdbmenu = """
@@ -876,8 +859,7 @@ class fpdb:
         if self.config.example_copy:
             self.info_box(_("Config file")
                          , _("has been created at:\n%s.\n") % self.config.file
-                           + _("Edit your screen_name and hand history path in the supported_sites ")
+                           + _("Edit your screen_name and hand history path in the supported_sites section of the Preferences window (Main menu) before trying to import hands."))
-                           + _("section of the Preferences window (Main menu) before trying to import hands."))
         self.settings = {}
         self.settings['global_lock'] = self.lock
         if (os.sep=="/"):
@@ -906,10 +888,10 @@ class fpdb:
             err_msg = _("MySQL client reports: 2002 or 2003 error. Unable to connect - ") \
                       + _("Please check that the MySQL service has been started")
         except Exceptions.FpdbPostgresqlAccessDenied:
-            err_msg = _("Postgres Server reports: Access denied. Are your permissions set correctly?")
+            err_msg = _("PostgreSQL Server reports: Access denied. Are your permissions set correctly?")
         except Exceptions.FpdbPostgresqlNoDatabase:
-            err_msg = _("Postgres client reports: Unable to connect - ") \
+            err_msg = _("PostgreSQL client reports: Unable to connect - ") \
-                      + _("Please check that the Postgres service has been started")
+                      + _("Please check that the PostgreSQL service has been started")
         if err_msg is not None:
             self.db = None
             self.warning_box(err_msg)
@@ -966,10 +948,10 @@ class fpdb:
     def obtain_global_lock(self, source):
         ret = self.lock.acquire(source=source) # will return false if lock is already held
         if ret:
-            print _("\nGlobal lock taken by"), source
+            print (_("\nGlobal lock taken by %s") % source)
             self.lockTakenBy=source
         else:
-            print _("\nFailed to get global lock, it is currently held by"), source
+            print (_("\nFailed to get global lock, it is currently held by %s") % source)
         return ret
         # need to release it later:
         # self.lock.release()
@@ -1134,8 +1116,8 @@ You can find the full license texts in agpl-3.0.txt, gpl-2.0.txt, gpl-3.0.txt an
 
         if not options.errorsToConsole:
             fileName = os.path.join(self.config.dir_log, 'fpdb-errors.txt')
-            print _("\nNote: error output is being diverted to fpdb-errors.txt and HUD-errors.txt in:\n") \
+            print (_("\nNote: error output is being diverted to fpdb-errors.txt and HUD-errors.txt in: %s") % self.config.dir_log) \
-                  + self.config.dir_log + _("\nAny major error will be reported there _only_.\n")
+                  + _("\nAny major error will be reported there _only_.\n")
             errorFile = open(fileName, 'w', 0)
             sys.stderr = errorFile
 
@@ -1240,7 +1222,7 @@ You can find the full license texts in agpl-3.0.txt, gpl-2.0.txt, gpl-3.0.txt an
             hhdir       = hhbase
             if not os.path.isdir(hhdir):
                 diapath = gtk.MessageDialog(parent=None, flags=0, type=gtk.MESSAGE_WARNING, buttons=(gtk.BUTTONS_YES_NO), message_format="Setup hh dir")
-                diastring = _("WARNING: Unable to find output hh directory %s\n\n Press YES to create this directory, or NO to select a new one.") % hhdir
+                diastring = _("WARNING: Unable to find output hand history directory %s\n\n Press YES to create this directory, or NO to select a new one.") % hhdir
                 diapath.format_secondary_text(diastring)
                 response = diapath.run()
                 diapath.destroy()

pyfpdb/fpdb_import.py

@@ -224,7 +224,7 @@ class Importer:
                 #print "                    adding file ", file
                 self.addImportFile(os.path.join(dir, file), site, filter)
         else:
-            log.warning(_("Attempted to add non-directory: '%s' as an import directory") % str(dir))
+            log.warning(_("Attempted to add non-directory '%s' as an import directory") % str(dir))
 
     def runImport(self):
         """"Run full import on self.filelist. This is called from GuiBulkImport.py"""
@@ -310,7 +310,7 @@ class Importer:
             toterrors += errors
 
         for i in xrange( self.settings['threads'] ):
-            print _("sending finish msg qlen ="), q.qsize()
+            print _("sending finish message queue length ="), q.qsize()
             db.send_finish_msg(q)
 
         return (totstored, totdups, totpartial, toterrors)
@@ -436,9 +436,9 @@ class Importer:
 
         # Load filter, process file, pass returned filename to import_fpdb_file
         if self.settings['threads'] > 0 and self.writeq is not None:
-            log.info(_("Converting ") + file + " (" + str(q.qsize()) + ")")
+            log.info((_("Converting %s") % file) + " (" + str(q.qsize()) + ")")
         else:
-            log.info(_("Converting ") + file)
+            log.info(_("Converting %s") % file)
         hhbase    = self.config.get_import_parameters().get("hhArchiveBase")
         hhbase    = os.path.expanduser(hhbase)
         hhdir     = os.path.join(hhbase,site)

pyfpdb/locale/create-mo-files.sh

@@ -1,4 +0,0 @@
-cd ..
-python /usr/share/doc/python-2.7/examples/Tools/i18n/msgfmt.py --output-file=locale/hu/LC_MESSAGES/fpdb.mo locale/fpdb-hu_HU.po
-python /usr/share/doc/python-2.7/examples/Tools/i18n/msgfmt.py --output-file=locale/de/LC_MESSAGES/fpdb.mo locale/fpdb-de_DE.po
-

pyfpdb/locale/create-po-file.sh

@@ -1,3 +0,0 @@
-cd ..
-python /usr/share/doc/python-2.7/examples/Tools/i18n/pygettext.py --output-dir=locale --default-domain=fpdb --output=fpdb-en_GB.po *.py*
-

pyfpdb/locale/localise.sh

@@ -0,0 +1,16 @@
+cd ..
+rm *.pyc
+
+echo "creating template po file"
+python /usr/share/doc/python-2.7/examples/Tools/i18n/pygettext.py --output-dir=locale --default-domain=fpdb --output=fpdb-en_GB.pot *.py*
+
+echo "merging template with existing translations"
+msgmerge --update locale/fpdb-de_DE.po locale/fpdb-en_GB.pot
+msgmerge --update locale/fpdb-fr_FR.po locale/fpdb-en_GB.pot
+msgmerge --update locale/fpdb-hu_HU.po locale/fpdb-en_GB.pot
+
+echo "compiling mo files"
+python /usr/share/doc/python-2.7/examples/Tools/i18n/msgfmt.py --output-file=locale/de/LC_MESSAGES/fpdb.mo locale/fpdb-de_DE.po
+python /usr/share/doc/python-2.7/examples/Tools/i18n/msgfmt.py --output-file=locale/hu/LC_MESSAGES/fpdb.mo locale/fpdb-hu_HU.po
+
+pocount locale/*.po

pyfpdb/locale/update-po-files.sh

@@ -1,3 +0,0 @@
-msgmerge --update fpdb-hu_HU.po fpdb-en_GB.po
-msgmerge --update fpdb-de_DE.po fpdb-en_GB.po
-

pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-6max-EUR-0.01-0.02.201008.Weird.table.character.txt.hp

@@ -0,0 +1,564 @@
+{   u'Player1': {   'card1': 0,
+                    'card2': 0,
+                    'card3': 0,
+                    'card4': 0,
+                    'card5': 0,
+                    'card6': 0,
+                    'card7': 0,
+                    'foldBbToStealChance': False,
+                    'foldSbToStealChance': False,
+                    'foldToOtherRaisedStreet0': False,
+                    'foldToOtherRaisedStreet1': False,
+                    'foldToOtherRaisedStreet2': False,
+                    'foldToOtherRaisedStreet3': False,
+                    'foldToOtherRaisedStreet4': False,
+                    'foldToStreet1CBChance': False,
+                    'foldToStreet1CBDone': False,
+                    'foldToStreet2CBChance': False,
+                    'foldToStreet2CBDone': False,
+                    'foldToStreet3CBChance': False,
+                    'foldToStreet3CBDone': False,
+                    'foldToStreet4CBChance': False,
+                    'foldToStreet4CBDone': False,
+                    'foldedBbToSteal': False,
+                    'foldedSbToSteal': False,
+                    'other3BStreet0': False,
+                    'other4BStreet0': False,
+                    'otherRaisedStreet0': False,
+                    'otherRaisedStreet1': False,
+                    'otherRaisedStreet2': False,
+                    'otherRaisedStreet3': False,
+                    'otherRaisedStreet4': False,
+                    'position': 2,
+                    'raiseFirstInChance': True,
+                    'raisedFirstIn': False,
+                    'rake': 0,
+                    'sawShowdown': False,
+                    'seatNo': 1,
+                    'sitout': False,
+                    'startCards': 0,
+                    'startCash': 129,
+                    'street0Aggr': False,
+                    'street0Bets': 0,
+                    'street0Calls': 0,
+                    'street0Raises': 0,
+                    'street0VPI': False,
+                    'street0_3BChance': False,
+                    'street0_3BDone': False,
+                    'street0_4BChance': False,
+                    'street0_4BDone': False,
+                    'street1Aggr': False,
+                    'street1Bets': 0,
+                    'street1CBChance': False,
+                    'street1CBDone': False,
+                    'street1Calls': 0,
+                    'street1CheckCallRaiseChance': False,
+                    'street1CheckCallRaiseDone': False,
+                    'street1Raises': 0,
+                    'street1Seen': False,
+                    'street2Aggr': False,
+                    'street2Bets': 0,
+                    'street2CBChance': False,
+                    'street2CBDone': False,
+                    'street2Calls': 0,
+                    'street2CheckCallRaiseChance': False,
+                    'street2CheckCallRaiseDone': False,
+                    'street2Raises': 0,
+                    'street2Seen': False,
+                    'street3Aggr': False,
+                    'street3Bets': 0,
+                    'street3CBChance': False,
+                    'street3CBDone': False,
+                    'street3Calls': 0,
+                    'street3CheckCallRaiseChance': False,
+                    'street3CheckCallRaiseDone': False,
+                    'street3Raises': 0,
+                    'street3Seen': False,
+                    'street4Aggr': False,
+                    'street4Bets': 0,
+                    'street4CBChance': False,
+                    'street4CBDone': False,
+                    'street4Calls': 0,
+                    'street4CheckCallRaiseChance': False,
+                    'street4CheckCallRaiseDone': False,
+                    'street4Raises': 0,
+                    'street4Seen': False,
+                    'totalProfit': 0,
+                    'tourneyTypeId': None,
+                    'tourneysPlayersIds': None,
+                    'winnings': 0,
+                    'wonAtSD': 0.0,
+                    'wonWhenSeenStreet1': 0.0,
+                    'wonWhenSeenStreet2': 0.0,
+                    'wonWhenSeenStreet3': 0.0,
+                    'wonWhenSeenStreet4': 0.0},
+    u'Player2': {   'card1': 0,
+                    'card2': 0,
+                    'card3': 0,
+                    'card4': 0,
+                    'card5': 0,
+                    'card6': 0,
+                    'card7': 0,
+                    'foldBbToStealChance': False,
+                    'foldSbToStealChance': False,
+                    'foldToOtherRaisedStreet0': False,
+                    'foldToOtherRaisedStreet1': False,
+                    'foldToOtherRaisedStreet2': False,
+                    'foldToOtherRaisedStreet3': False,
+                    'foldToOtherRaisedStreet4': False,
+                    'foldToStreet1CBChance': False,
+                    'foldToStreet1CBDone': False,
+                    'foldToStreet2CBChance': False,
+                    'foldToStreet2CBDone': False,
+                    'foldToStreet3CBChance': False,
+                    'foldToStreet3CBDone': False,
+                    'foldToStreet4CBChance': False,
+                    'foldToStreet4CBDone': False,
+                    'foldedBbToSteal': False,
+                    'foldedSbToSteal': False,
+                    'other3BStreet0': False,
+                    'other4BStreet0': False,
+                    'otherRaisedStreet0': False,
+                    'otherRaisedStreet1': False,
+                    'otherRaisedStreet2': False,
+                    'otherRaisedStreet3': False,
+                    'otherRaisedStreet4': False,
+                    'position': 1,
+                    'raiseFirstInChance': True,
+                    'raisedFirstIn': False,
+                    'rake': 0,
+                    'sawShowdown': False,
+                    'seatNo': 2,
+                    'sitout': False,
+                    'startCards': 0,
+                    'startCash': 170,
+                    'street0Aggr': False,
+                    'street0Bets': 0,
+                    'street0Calls': 0,
+                    'street0Raises': 0,
+                    'street0VPI': False,
+                    'street0_3BChance': False,
+                    'street0_3BDone': False,
+                    'street0_4BChance': False,
+                    'street0_4BDone': False,
+                    'street1Aggr': False,
+                    'street1Bets': 0,
+                    'street1CBChance': False,
+                    'street1CBDone': False,
+                    'street1Calls': 0,
+                    'street1CheckCallRaiseChance': False,
+                    'street1CheckCallRaiseDone': False,
+                    'street1Raises': 0,
+                    'street1Seen': False,
+                    'street2Aggr': False,
+                    'street2Bets': 0,
+                    'street2CBChance': False,
+                    'street2CBDone': False,
+                    'street2Calls': 0,
+                    'street2CheckCallRaiseChance': False,
+                    'street2CheckCallRaiseDone': False,
+                    'street2Raises': 0,
+                    'street2Seen': False,
+                    'street3Aggr': False,
+                    'street3Bets': 0,
+                    'street3CBChance': False,
+                    'street3CBDone': False,
+                    'street3Calls': 0,
+                    'street3CheckCallRaiseChance': False,
+                    'street3CheckCallRaiseDone': False,
+                    'street3Raises': 0,
+                    'street3Seen': False,
+                    'street4Aggr': False,
+                    'street4Bets': 0,
+                    'street4CBChance': False,
+                    'street4CBDone': False,
+                    'street4Calls': 0,
+                    'street4CheckCallRaiseChance': False,
+                    'street4CheckCallRaiseDone': False,
+                    'street4Raises': 0,
+                    'street4Seen': False,
+                    'totalProfit': 0,
+                    'tourneyTypeId': None,
+                    'tourneysPlayersIds': None,
+                    'winnings': 0,
+                    'wonAtSD': 0.0,
+                    'wonWhenSeenStreet1': 0.0,
+                    'wonWhenSeenStreet2': 0.0,
+                    'wonWhenSeenStreet3': 0.0,
+                    'wonWhenSeenStreet4': 0.0},
+    u'Player3': {   'card1': 0,
+                    'card2': 0,
+                    'card3': 0,
+                    'card4': 0,
+                    'card5': 0,
+                    'card6': 0,
+                    'card7': 0,
+                    'foldBbToStealChance': False,
+                    'foldSbToStealChance': False,
+                    'foldToOtherRaisedStreet0': False,
+                    'foldToOtherRaisedStreet1': False,
+                    'foldToOtherRaisedStreet2': False,
+                    'foldToOtherRaisedStreet3': False,
+                    'foldToOtherRaisedStreet4': False,
+                    'foldToStreet1CBChance': False,
+                    'foldToStreet1CBDone': False,
+                    'foldToStreet2CBChance': False,
+                    'foldToStreet2CBDone': False,
+                    'foldToStreet3CBChance': False,
+                    'foldToStreet3CBDone': False,
+                    'foldToStreet4CBChance': False,
+                    'foldToStreet4CBDone': False,
+                    'foldedBbToSteal': False,
+                    'foldedSbToSteal': False,
+                    'other3BStreet0': False,
+                    'other4BStreet0': False,
+                    'otherRaisedStreet0': False,
+                    'otherRaisedStreet1': False,
+                    'otherRaisedStreet2': False,
+                    'otherRaisedStreet3': False,
+                    'otherRaisedStreet4': False,
+                    'position': 0,
+                    'raiseFirstInChance': True,
+                    'raisedFirstIn': True,
+                    'rake': 0,
+                    'sawShowdown': False,
+                    'seatNo': 3,
+                    'sitout': False,
+                    'startCards': 0,
+                    'startCash': 163,
+                    'street0Aggr': True,
+                    'street0Bets': 0,
+                    'street0Calls': 0,
+                    'street0Raises': 0,
+                    'street0VPI': True,
+                    'street0_3BChance': False,
+                    'street0_3BDone': False,
+                    'street0_4BChance': False,
+                    'street0_4BDone': False,
+                    'street1Aggr': False,
+                    'street1Bets': 0,
+                    'street1CBChance': False,
+                    'street1CBDone': False,
+                    'street1Calls': 0,
+                    'street1CheckCallRaiseChance': False,
+                    'street1CheckCallRaiseDone': False,
+                    'street1Raises': 0,
+                    'street1Seen': False,
+                    'street2Aggr': False,
+                    'street2Bets': 0,
+                    'street2CBChance': False,
+                    'street2CBDone': False,
+                    'street2Calls': 0,
+                    'street2CheckCallRaiseChance': False,
+                    'street2CheckCallRaiseDone': False,
+                    'street2Raises': 0,
+                    'street2Seen': False,
+                    'street3Aggr': False,
+                    'street3Bets': 0,
+                    'street3CBChance': False,
+                    'street3CBDone': False,
+                    'street3Calls': 0,
+                    'street3CheckCallRaiseChance': False,
+                    'street3CheckCallRaiseDone': False,
+                    'street3Raises': 0,
+                    'street3Seen': False,
+                    'street4Aggr': False,
+                    'street4Bets': 0,
+                    'street4CBChance': False,
+                    'street4CBDone': False,
+                    'street4Calls': 0,
+                    'street4CheckCallRaiseChance': False,
+                    'street4CheckCallRaiseDone': False,
+                    'street4Raises': 0,
+                    'street4Seen': False,
+                    'totalProfit': 3,
+                    'tourneyTypeId': None,
+                    'tourneysPlayersIds': None,
+                    'winnings': 5,
+                    'wonAtSD': 0.0,
+                    'wonWhenSeenStreet1': 0.0,
+                    'wonWhenSeenStreet2': 0.0,
+                    'wonWhenSeenStreet3': 0.0,
+                    'wonWhenSeenStreet4': 0.0},
+    u'Player4': {   'card1': 0,
+                    'card2': 0,
+                    'card3': 0,
+                    'card4': 0,
+                    'card5': 0,
+                    'card6': 0,
+                    'card7': 0,
+                    'foldBbToStealChance': False,
+                    'foldSbToStealChance': True,
+                    'foldToOtherRaisedStreet0': False,
+                    'foldToOtherRaisedStreet1': False,
+                    'foldToOtherRaisedStreet2': False,
+                    'foldToOtherRaisedStreet3': False,
+                    'foldToOtherRaisedStreet4': False,
+                    'foldToStreet1CBChance': False,
+                    'foldToStreet1CBDone': False,
+                    'foldToStreet2CBChance': False,
+                    'foldToStreet2CBDone': False,
+                    'foldToStreet3CBChance': False,
+                    'foldToStreet3CBDone': False,
+                    'foldToStreet4CBChance': False,
+                    'foldToStreet4CBDone': False,
+                    'foldedBbToSteal': False,
+                    'foldedSbToSteal': True,
+                    'other3BStreet0': False,
+                    'other4BStreet0': False,
+                    'otherRaisedStreet0': False,
+                    'otherRaisedStreet1': False,
+                    'otherRaisedStreet2': False,
+                    'otherRaisedStreet3': False,
+                    'otherRaisedStreet4': False,
+                    'position': 'S',
+                    'raiseFirstInChance': False,
+                    'raisedFirstIn': False,
+                    'rake': 0,
+                    'sawShowdown': False,
+                    'seatNo': 4,
+                    'sitout': False,
+                    'startCards': 0,
+                    'startCash': 227,
+                    'street0Aggr': False,
+                    'street0Bets': 0,
+                    'street0Calls': 0,
+                    'street0Raises': 0,
+                    'street0VPI': False,
+                    'street0_3BChance': True,
+                    'street0_3BDone': False,
+                    'street0_4BChance': False,
+                    'street0_4BDone': False,
+                    'street1Aggr': False,
+                    'street1Bets': 0,
+                    'street1CBChance': False,
+                    'street1CBDone': False,
+                    'street1Calls': 0,
+                    'street1CheckCallRaiseChance': False,
+                    'street1CheckCallRaiseDone': False,
+                    'street1Raises': 0,
+                    'street1Seen': False,
+                    'street2Aggr': False,
+                    'street2Bets': 0,
+                    'street2CBChance': False,
+                    'street2CBDone': False,
+                    'street2Calls': 0,
+                    'street2CheckCallRaiseChance': False,
+                    'street2CheckCallRaiseDone': False,
+                    'street2Raises': 0,
+                    'street2Seen': False,
+                    'street3Aggr': False,
+                    'street3Bets': 0,
+                    'street3CBChance': False,
+                    'street3CBDone': False,
+                    'street3Calls': 0,
+                    'street3CheckCallRaiseChance': False,
+                    'street3CheckCallRaiseDone': False,
+                    'street3Raises': 0,
+                    'street3Seen': False,
+                    'street4Aggr': False,
+                    'street4Bets': 0,
+                    'street4CBChance': False,
+                    'street4CBDone': False,
+                    'street4Calls': 0,
+                    'street4CheckCallRaiseChance': False,
+                    'street4CheckCallRaiseDone': False,
+                    'street4Raises': 0,
+                    'street4Seen': False,
+                    'totalProfit': -1,
+                    'tourneyTypeId': None,
+                    'tourneysPlayersIds': None,
+                    'winnings': 0,
+                    'wonAtSD': 0.0,
+                    'wonWhenSeenStreet1': 0.0,
+                    'wonWhenSeenStreet2': 0.0,
+                    'wonWhenSeenStreet3': 0.0,
+                    'wonWhenSeenStreet4': 0.0},
+    u'Player5': {   'card1': 1,
+                    'card2': 34,
+                    'card3': 0,
+                    'card4': 0,
+                    'card5': 0,
+                    'card6': 0,
+                    'card7': 0,
+                    'foldBbToStealChance': True,
+                    'foldSbToStealChance': False,
+                    'foldToOtherRaisedStreet0': False,
+                    'foldToOtherRaisedStreet1': False,
+                    'foldToOtherRaisedStreet2': False,
+                    'foldToOtherRaisedStreet3': False,
+                    'foldToOtherRaisedStreet4': False,
+                    'foldToStreet1CBChance': False,
+                    'foldToStreet1CBDone': False,
+                    'foldToStreet2CBChance': False,
+                    'foldToStreet2CBDone': False,
+                    'foldToStreet3CBChance': False,
+                    'foldToStreet3CBDone': False,
+                    'foldToStreet4CBChance': False,
+                    'foldToStreet4CBDone': False,
+                    'foldedBbToSteal': True,
+                    'foldedSbToSteal': False,
+                    'other3BStreet0': False,
+                    'other4BStreet0': False,
+                    'otherRaisedStreet0': False,
+                    'otherRaisedStreet1': False,
+                    'otherRaisedStreet2': False,
+                    'otherRaisedStreet3': False,
+                    'otherRaisedStreet4': False,
+                    'position': 'B',
+                    'raiseFirstInChance': False,
+                    'raisedFirstIn': False,
+                    'rake': 0,
+                    'sawShowdown': False,
+                    'seatNo': 5,
+                    'sitout': False,
+                    'startCards': 8,
+                    'startCash': 200,
+                    'street0Aggr': False,
+                    'street0Bets': 0,
+                    'street0Calls': 0,
+                    'street0Raises': 0,
+                    'street0VPI': False,
+                    'street0_3BChance': True,
+                    'street0_3BDone': False,
+                    'street0_4BChance': False,
+                    'street0_4BDone': False,
+                    'street1Aggr': False,
+                    'street1Bets': 0,
+                    'street1CBChance': False,
+                    'street1CBDone': False,
+                    'street1Calls': 0,
+                    'street1CheckCallRaiseChance': False,
+                    'street1CheckCallRaiseDone': False,
+                    'street1Raises': 0,
+                    'street1Seen': False,
+                    'street2Aggr': False,
+                    'street2Bets': 0,
+                    'street2CBChance': False,
+                    'street2CBDone': False,
+                    'street2Calls': 0,
+                    'street2CheckCallRaiseChance': False,
+                    'street2CheckCallRaiseDone': False,
+                    'street2Raises': 0,
+                    'street2Seen': False,
+                    'street3Aggr': False,
+                    'street3Bets': 0,
+                    'street3CBChance': False,
+                    'street3CBDone': False,
+                    'street3Calls': 0,
+                    'street3CheckCallRaiseChance': False,
+                    'street3CheckCallRaiseDone': False,
+                    'street3Raises': 0,
+                    'street3Seen': False,
+                    'street4Aggr': False,
+                    'street4Bets': 0,
+                    'street4CBChance': False,
+                    'street4CBDone': False,
+                    'street4Calls': 0,
+                    'street4CheckCallRaiseChance': False,
+                    'street4CheckCallRaiseDone': False,
+                    'street4Raises': 0,
+                    'street4Seen': False,
+                    'totalProfit': -2,
+                    'tourneyTypeId': None,
+                    'tourneysPlayersIds': None,
+                    'winnings': 0,
+                    'wonAtSD': 0.0,
+                    'wonWhenSeenStreet1': 0.0,
+                    'wonWhenSeenStreet2': 0.0,
+                    'wonWhenSeenStreet3': 0.0,
+                    'wonWhenSeenStreet4': 0.0},
+    u'Player6': {   'card1': 0,
+                    'card2': 0,
+                    'card3': 0,
+                    'card4': 0,
+                    'card5': 0,
+                    'card6': 0,
+                    'card7': 0,
+                    'foldBbToStealChance': False,
+                    'foldSbToStealChance': False,
+                    'foldToOtherRaisedStreet0': False,
+                    'foldToOtherRaisedStreet1': False,
+                    'foldToOtherRaisedStreet2': False,
+                    'foldToOtherRaisedStreet3': False,
+                    'foldToOtherRaisedStreet4': False,
+                    'foldToStreet1CBChance': False,
+                    'foldToStreet1CBDone': False,
+                    'foldToStreet2CBChance': False,
+                    'foldToStreet2CBDone': False,
+                    'foldToStreet3CBChance': False,
+                    'foldToStreet3CBDone': False,
+                    'foldToStreet4CBChance': False,
+                    'foldToStreet4CBDone': False,
+                    'foldedBbToSteal': False,
+                    'foldedSbToSteal': False,
+                    'other3BStreet0': False,
+                    'other4BStreet0': False,
+                    'otherRaisedStreet0': False,
+                    'otherRaisedStreet1': False,
+                    'otherRaisedStreet2': False,
+                    'otherRaisedStreet3': False,
+                    'otherRaisedStreet4': False,
+                    'position': 3,
+                    'raiseFirstInChance': True,
+                    'raisedFirstIn': False,
+                    'rake': 0,
+                    'sawShowdown': False,
+                    'seatNo': 6,
+                    'sitout': False,
+                    'startCards': 0,
+                    'startCash': 330,
+                    'street0Aggr': False,
+                    'street0Bets': 0,
+                    'street0Calls': 0,
+                    'street0Raises': 0,
+                    'street0VPI': False,
+                    'street0_3BChance': False,
+                    'street0_3BDone': False,
+                    'street0_4BChance': False,
+                    'street0_4BDone': False,
+                    'street1Aggr': False,
+                    'street1Bets': 0,
+                    'street1CBChance': False,
+                    'street1CBDone': False,
+                    'street1Calls': 0,
+                    'street1CheckCallRaiseChance': False,
+                    'street1CheckCallRaiseDone': False,
+                    'street1Raises': 0,
+                    'street1Seen': False,
+                    'street2Aggr': False,
+                    'street2Bets': 0,
+                    'street2CBChance': False,
+                    'street2CBDone': False,
+                    'street2Calls': 0,
+                    'street2CheckCallRaiseChance': False,
+                    'street2CheckCallRaiseDone': False,
+                    'street2Raises': 0,
+                    'street2Seen': False,
+                    'street3Aggr': False,
+                    'street3Bets': 0,
+                    'street3CBChance': False,
+                    'street3CBDone': False,
+                    'street3Calls': 0,
+                    'street3CheckCallRaiseChance': False,
+                    'street3CheckCallRaiseDone': False,
+                    'street3Raises': 0,
+                    'street3Seen': False,
+                    'street4Aggr': False,
+                    'street4Bets': 0,
+                    'street4CBChance': False,
+                    'street4CBDone': False,
+                    'street4Calls': 0,
+                    'street4CheckCallRaiseChance': False,
+                    'street4CheckCallRaiseDone': False,
+                    'street4Raises': 0,
+                    'street4Seen': False,
+                    'totalProfit': 0,
+                    'tourneyTypeId': None,
+                    'tourneysPlayersIds': None,
+                    'winnings': 0,
+                    'wonAtSD': 0.0,
+                    'wonWhenSeenStreet1': 0.0,
+                    'wonWhenSeenStreet2': 0.0,
+                    'wonWhenSeenStreet3': 0.0,
+                    'wonWhenSeenStreet4': 0.0}}

pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-9max-USD-0.02-0.05.201007.Short.lived.date.format.txt

@@ -0,0 +1,39 @@
+Full Tilt Poker Game #22488827305: Table Flash - $0.02/$0.05 - No Limit Hold'em - 15:13 ET - Wed, July 21, 2010
+Seat 1: ronaldd1969 ($2.70)
+Seat 2: stark00 ($4.41)
+Seat 3: T0r3x ($12.97)
+Seat 4: yrthligar ($15)
+Seat 5: MANUTD ($8.56)
+Seat 6: gimick ($2)
+Seat 7: vision ($2.97)
+Seat 8: shleekom ($2)
+Seat 9: proud2Bwhack ($8.77)
+MANUTD posts the small blind of $0.02
+gimick posts the big blind of $0.05
+The button is in seat #4
+*** HOLE CARDS ***
+Dealt to gimick [Qs 4d]
+vision folds
+shleekom folds
+proud2Bwhack folds
+ronaldd1969 folds
+stark00 folds
+T0r3x folds
+yrthligar has 8 seconds left to act
+yrthligar has timed out
+yrthligar folds
+MANUTD folds
+Uncalled bet of $0.03 returned to gimick
+gimick mucks
+gimick wins the pot ($0.04)
+*** SUMMARY ***
+Total pot $0.04 | Rake $0
+Seat 1: ronaldd1969 didn't bet (folded)
+Seat 2: stark00 didn't bet (folded)
+Seat 3: T0r3x didn't bet (folded)
+Seat 4: yrthligar (button) didn't bet (folded)
+Seat 5: MANUTD (small blind) folded before the Flop
+Seat 6: gimick (big blind) collected ($0.04), mucked
+Seat 7: vision didn't bet (folded)
+Seat 8: shleekom didn't bet (folded)
+Seat 9: proud2Bwhack didn't bet (folded)

pyfpdb/regression-test-files/cash/FTP/Flop/NLHE-9max-USD-0.02-0.05.201007.Short.lived.date.format.txt.hp

@@ -0,0 +1,846 @@
+{   u'MANUTD': {   'card1': 0,
+                   'card2': 0,
+                   'card3': 0,
+                   'card4': 0,
+                   'card5': 0,
+                   'card6': 0,
+                   'card7': 0,
+                   'foldBbToStealChance': False,
+                   'foldSbToStealChance': False,
+                   'foldToOtherRaisedStreet0': False,
+                   'foldToOtherRaisedStreet1': False,
+                   'foldToOtherRaisedStreet2': False,
+                   'foldToOtherRaisedStreet3': False,
+                   'foldToOtherRaisedStreet4': False,
+                   'foldToStreet1CBChance': False,
+                   'foldToStreet1CBDone': False,
+                   'foldToStreet2CBChance': False,
+                   'foldToStreet2CBDone': False,
+                   'foldToStreet3CBChance': False,
+                   'foldToStreet3CBDone': False,
+                   'foldToStreet4CBChance': False,
+                   'foldToStreet4CBDone': False,
+                   'foldedBbToSteal': False,
+                   'foldedSbToSteal': False,
+                   'other3BStreet0': False,
+                   'other4BStreet0': False,
+                   'otherRaisedStreet0': False,
+                   'otherRaisedStreet1': False,
+                   'otherRaisedStreet2': False,
+                   'otherRaisedStreet3': False,
+                   'otherRaisedStreet4': False,
+                   'position': 'S',
+                   'raiseFirstInChance': True,
+                   'raisedFirstIn': False,
+                   'rake': 0,
+                   'sawShowdown': False,
+                   'seatNo': 5,
+                   'sitout': False,
+                   'startCards': 0,
+                   'startCash': 856,
+                   'street0Aggr': False,
+                   'street0Bets': 0,
+                   'street0Calls': 0,
+                   'street0Raises': 0,
+                   'street0VPI': False,
+                   'street0_3BChance': False,
+                   'street0_3BDone': False,
+                   'street0_4BChance': False,
+                   'street0_4BDone': False,
+                   'street1Aggr': False,
+                   'street1Bets': 0,
+                   'street1CBChance': False,
+                   'street1CBDone': False,
+                   'street1Calls': 0,
+                   'street1CheckCallRaiseChance': False,
+                   'street1CheckCallRaiseDone': False,
+                   'street1Raises': 0,
+                   'street1Seen': False,
+                   'street2Aggr': False,
+                   'street2Bets': 0,
+                   'street2CBChance': False,
+                   'street2CBDone': False,
+                   'street2Calls': 0,
+                   'street2CheckCallRaiseChance': False,
+                   'street2CheckCallRaiseDone': False,
+                   'street2Raises': 0,
+                   'street2Seen': False,
+                   'street3Aggr': False,
+                   'street3Bets': 0,
+                   'street3CBChance': False,
+                   'street3CBDone': False,
+                   'street3Calls': 0,
+                   'street3CheckCallRaiseChance': False,
+                   'street3CheckCallRaiseDone': False,
+                   'street3Raises': 0,
+                   'street3Seen': False,
+                   'street4Aggr': False,
+                   'street4Bets': 0,
+                   'street4CBChance': False,
+                   'street4CBDone': False,
+                   'street4Calls': 0,
+                   'street4CheckCallRaiseChance': False,
+                   'street4CheckCallRaiseDone': False,
+                   'street4Raises': 0,
+                   'street4Seen': False,
+                   'totalProfit': -2,
+                   'tourneyTypeId': None,
+                   'tourneysPlayersIds': None,
+                   'winnings': 0,
+                   'wonAtSD': 0.0,
+                   'wonWhenSeenStreet1': 0.0,
+                   'wonWhenSeenStreet2': 0.0,
+                   'wonWhenSeenStreet3': 0.0,
+                   'wonWhenSeenStreet4': 0.0},
+    u'T0r3x': {   'card1': 0,
+                  'card2': 0,
+                  'card3': 0,
+                  'card4': 0,
+                  'card5': 0,
+                  'card6': 0,
+                  'card7': 0,
+                  'foldBbToStealChance': False,
+                  'foldSbToStealChance': False,
+                  'foldToOtherRaisedStreet0': False,
+                  'foldToOtherRaisedStreet1': False,
+                  'foldToOtherRaisedStreet2': False,
+                  'foldToOtherRaisedStreet3': False,
+                  'foldToOtherRaisedStreet4': False,
+                  'foldToStreet1CBChance': False,
+                  'foldToStreet1CBDone': False,
+                  'foldToStreet2CBChance': False,
+                  'foldToStreet2CBDone': False,
+                  'foldToStreet3CBChance': False,
+                  'foldToStreet3CBDone': False,
+                  'foldToStreet4CBChance': False,
+                  'foldToStreet4CBDone': False,
+                  'foldedBbToSteal': False,
+                  'foldedSbToSteal': False,
+                  'other3BStreet0': False,
+                  'other4BStreet0': False,
+                  'otherRaisedStreet0': False,
+                  'otherRaisedStreet1': False,
+                  'otherRaisedStreet2': False,
+                  'otherRaisedStreet3': False,
+                  'otherRaisedStreet4': False,
+                  'position': 1,
+                  'raiseFirstInChance': True,
+                  'raisedFirstIn': False,
+                  'rake': 0,
+                  'sawShowdown': False,
+                  'seatNo': 3,
+                  'sitout': False,
+                  'startCards': 0,
+                  'startCash': 1297,
+                  'street0Aggr': False,
+                  'street0Bets': 0,
+                  'street0Calls': 0,
+                  'street0Raises': 0,
+                  'street0VPI': False,
+                  'street0_3BChance': False,
+                  'street0_3BDone': False,
+                  'street0_4BChance': False,
+                  'street0_4BDone': False,
+                  'street1Aggr': False,
+                  'street1Bets': 0,
+                  'street1CBChance': False,
+                  'street1CBDone': False,
+                  'street1Calls': 0,
+                  'street1CheckCallRaiseChance': False,
+                  'street1CheckCallRaiseDone': False,
+                  'street1Raises': 0,
+                  'street1Seen': False,
+                  'street2Aggr': False,
+                  'street2Bets': 0,
+                  'street2CBChance': False,
+                  'street2CBDone': False,
+                  'street2Calls': 0,
+                  'street2CheckCallRaiseChance': False,
+                  'street2CheckCallRaiseDone': False,
+                  'street2Raises': 0,
+                  'street2Seen': False,
+                  'street3Aggr': False,
+                  'street3Bets': 0,
+                  'street3CBChance': False,
+                  'street3CBDone': False,
+                  'street3Calls': 0,
+                  'street3CheckCallRaiseChance': False,
+                  'street3CheckCallRaiseDone': False,
+                  'street3Raises': 0,
+                  'street3Seen': False,
+                  'street4Aggr': False,
+                  'street4Bets': 0,
+                  'street4CBChance': False,
+                  'street4CBDone': False,
+                  'street4Calls': 0,
+                  'street4CheckCallRaiseChance': False,
+                  'street4CheckCallRaiseDone': False,
+                  'street4Raises': 0,
+                  'street4Seen': False,
+                  'totalProfit': 0,
+                  'tourneyTypeId': None,
+                  'tourneysPlayersIds': None,
+                  'winnings': 0,
+                  'wonAtSD': 0.0,
+                  'wonWhenSeenStreet1': 0.0,
+                  'wonWhenSeenStreet2': 0.0,
+                  'wonWhenSeenStreet3': 0.0,
+                  'wonWhenSeenStreet4': 0.0},
+    u'gimick': {   'card1': 50,
+                   'card2': 16,
+                   'card3': 0,
+                   'card4': 0,
+                   'card5': 0,
+                   'card6': 0,
+                   'card7': 0,
+                   'foldBbToStealChance': False,
+                   'foldSbToStealChance': False,
+                   'foldToOtherRaisedStreet0': False,
+                   'foldToOtherRaisedStreet1': False,
+                   'foldToOtherRaisedStreet2': False,
+                   'foldToOtherRaisedStreet3': False,
+                   'foldToOtherRaisedStreet4': False,
+                   'foldToStreet1CBChance': False,
+                   'foldToStreet1CBDone': False,
+                   'foldToStreet2CBChance': False,
+                   'foldToStreet2CBDone': False,
+                   'foldToStreet3CBChance': False,
+                   'foldToStreet3CBDone': False,
+                   'foldToStreet4CBChance': False,
+                   'foldToStreet4CBDone': False,
+                   'foldedBbToSteal': False,
+                   'foldedSbToSteal': False,
+                   'other3BStreet0': False,
+                   'other4BStreet0': False,
+                   'otherRaisedStreet0': False,
+                   'otherRaisedStreet1': False,
+                   'otherRaisedStreet2': False,
+                   'otherRaisedStreet3': False,
+                   'otherRaisedStreet4': False,
+                   'position': 'B',
+                   'raiseFirstInChance': False,
+                   'raisedFirstIn': False,
+                   'rake': 0,
+                   'sawShowdown': False,
+                   'seatNo': 6,
+                   'sitout': False,
+                   'startCards': 37,
+                   'startCash': 200,
+                   'street0Aggr': False,
+                   'street0Bets': 0,
+                   'street0Calls': 0,
+                   'street0Raises': 0,
+                   'street0VPI': False,
+                   'street0_3BChance': False,
+                   'street0_3BDone': False,
+                   'street0_4BChance': False,
+                   'street0_4BDone': False,
+                   'street1Aggr': False,
+                   'street1Bets': 0,
+                   'street1CBChance': False,
+                   'street1CBDone': False,
+                   'street1Calls': 0,
+                   'street1CheckCallRaiseChance': False,
+                   'street1CheckCallRaiseDone': False,
+                   'street1Raises': 0,
+                   'street1Seen': False,
+                   'street2Aggr': False,
+                   'street2Bets': 0,
+                   'street2CBChance': False,
+                   'street2CBDone': False,
+                   'street2Calls': 0,
+                   'street2CheckCallRaiseChance': False,
+                   'street2CheckCallRaiseDone': False,
+                   'street2Raises': 0,
+                   'street2Seen': False,
+                   'street3Aggr': False,
+                   'street3Bets': 0,
+                   'street3CBChance': False,
+                   'street3CBDone': False,
+                   'street3Calls': 0,
+                   'street3CheckCallRaiseChance': False,
+                   'street3CheckCallRaiseDone': False,
+                   'street3Raises': 0,
+                   'street3Seen': False,
+                   'street4Aggr': False,
+                   'street4Bets': 0,
+                   'street4CBChance': False,
+                   'street4CBDone': False,
+                   'street4Calls': 0,
+                   'street4CheckCallRaiseChance': False,
+                   'street4CheckCallRaiseDone': False,
+                   'street4Raises': 0,
+                   'street4Seen': False,
+                   'totalProfit': 2,
+                   'tourneyTypeId': None,
+                   'tourneysPlayersIds': None,
+                   'winnings': 4,
+                   'wonAtSD': 0.0,
+                   'wonWhenSeenStreet1': 0.0,
+                   'wonWhenSeenStreet2': 0.0,
+                   'wonWhenSeenStreet3': 0.0,
+                   'wonWhenSeenStreet4': 0.0},
+    u'proud2Bwhack': {   'card1': 0,
+                         'card2': 0,
+                         'card3': 0,
+                         'card4': 0,
+                         'card5': 0,
+                         'card6': 0,
+                         'card7': 0,
+                         'foldBbToStealChance': False,
+                         'foldSbToStealChance': False,
+                         'foldToOtherRaisedStreet0': False,
+                         'foldToOtherRaisedStreet1': False,
+                         'foldToOtherRaisedStreet2': False,
+                         'foldToOtherRaisedStreet3': False,
+                         'foldToOtherRaisedStreet4': False,
+                         'foldToStreet1CBChance': False,
+                         'foldToStreet1CBDone': False,
+                         'foldToStreet2CBChance': False,
+                         'foldToStreet2CBDone': False,
+                         'foldToStreet3CBChance': False,
+                         'foldToStreet3CBDone': False,
+                         'foldToStreet4CBChance': False,
+                         'foldToStreet4CBDone': False,
+                         'foldedBbToSteal': False,
+                         'foldedSbToSteal': False,
+                         'other3BStreet0': False,
+                         'other4BStreet0': False,
+                         'otherRaisedStreet0': False,
+                         'otherRaisedStreet1': False,
+                         'otherRaisedStreet2': False,
+                         'otherRaisedStreet3': False,
+                         'otherRaisedStreet4': False,
+                         'position': 4,
+                         'raiseFirstInChance': True,
+                         'raisedFirstIn': False,
+                         'rake': 0,
+                         'sawShowdown': False,
+                         'seatNo': 9,
+                         'sitout': False,
+                         'startCards': 0,
+                         'startCash': 877,
+                         'street0Aggr': False,
+                         'street0Bets': 0,
+                         'street0Calls': 0,
+                         'street0Raises': 0,
+                         'street0VPI': False,
+                         'street0_3BChance': False,
+                         'street0_3BDone': False,
+                         'street0_4BChance': False,
+                         'street0_4BDone': False,
+                         'street1Aggr': False,
+                         'street1Bets': 0,
+                         'street1CBChance': False,
+                         'street1CBDone': False,
+                         'street1Calls': 0,
+                         'street1CheckCallRaiseChance': False,
+                         'street1CheckCallRaiseDone': False,
+                         'street1Raises': 0,
+                         'street1Seen': False,
+                         'street2Aggr': False,
+                         'street2Bets': 0,
+                         'street2CBChance': False,
+                         'street2CBDone': False,
+                         'street2Calls': 0,
+                         'street2CheckCallRaiseChance': False,
+                         'street2CheckCallRaiseDone': False,
+                         'street2Raises': 0,
+                         'street2Seen': False,
+                         'street3Aggr': False,
+                         'street3Bets': 0,
+                         'street3CBChance': False,
+                         'street3CBDone': False,
+                         'street3Calls': 0,
+                         'street3CheckCallRaiseChance': False,
+                         'street3CheckCallRaiseDone': False,
+                         'street3Raises': 0,
+                         'street3Seen': False,
+                         'street4Aggr': False,
+                         'street4Bets': 0,
+                         'street4CBChance': False,
+                         'street4CBDone': False,
+                         'street4Calls': 0,
+                         'street4CheckCallRaiseChance': False,
+                         'street4CheckCallRaiseDone': False,
+                         'street4Raises': 0,
+                         'street4Seen': False,
+                         'totalProfit': 0,
+                         'tourneyTypeId': None,
+                         'tourneysPlayersIds': None,
+                         'winnings': 0,
+                         'wonAtSD': 0.0,
+                         'wonWhenSeenStreet1': 0.0,
+                         'wonWhenSeenStreet2': 0.0,
+                         'wonWhenSeenStreet3': 0.0,
+                         'wonWhenSeenStreet4': 0.0},
+    u'ronaldd1969': {   'card1': 0,
+                        'card2': 0,
+                        'card3': 0,
+                        'card4': 0,
+                        'card5': 0,
+                        'card6': 0,
+                        'card7': 0,
+                        'foldBbToStealChance': False,
+                        'foldSbToStealChance': False,
+                        'foldToOtherRaisedStreet0': False,
+                        'foldToOtherRaisedStreet1': False,
+                        'foldToOtherRaisedStreet2': False,
+                        'foldToOtherRaisedStreet3': False,
+                        'foldToOtherRaisedStreet4': False,
+                        'foldToStreet1CBChance': False,
+                        'foldToStreet1CBDone': False,
+                        'foldToStreet2CBChance': False,
+                        'foldToStreet2CBDone': False,
+                        'foldToStreet3CBChance': False,
+                        'foldToStreet3CBDone': False,
+                        'foldToStreet4CBChance': False,
+                        'foldToStreet4CBDone': False,
+                        'foldedBbToSteal': False,
+                        'foldedSbToSteal': False,
+                        'other3BStreet0': False,
+                        'other4BStreet0': False,
+                        'otherRaisedStreet0': False,
+                        'otherRaisedStreet1': False,
+                        'otherRaisedStreet2': False,
+                        'otherRaisedStreet3': False,
+                        'otherRaisedStreet4': False,
+                        'position': 3,
+                        'raiseFirstInChance': True,
+                        'raisedFirstIn': False,
+                        'rake': 0,
+                        'sawShowdown': False,
+                        'seatNo': 1,
+                        'sitout': False,
+                        'startCards': 0,
+                        'startCash': 270,
+                        'street0Aggr': False,
+                        'street0Bets': 0,
+                        'street0Calls': 0,
+                        'street0Raises': 0,
+                        'street0VPI': False,
+                        'street0_3BChance': False,
+                        'street0_3BDone': False,
+                        'street0_4BChance': False,
+                        'street0_4BDone': False,
+                        'street1Aggr': False,
+                        'street1Bets': 0,
+                        'street1CBChance': False,
+                        'street1CBDone': False,
+                        'street1Calls': 0,
+                        'street1CheckCallRaiseChance': False,
+                        'street1CheckCallRaiseDone': False,
+                        'street1Raises': 0,
+                        'street1Seen': False,
+                        'street2Aggr': False,
+                        'street2Bets': 0,
+                        'street2CBChance': False,
+                        'street2CBDone': False,
+                        'street2Calls': 0,
+                        'street2CheckCallRaiseChance': False,
+                        'street2CheckCallRaiseDone': False,
+                        'street2Raises': 0,
+                        'street2Seen': False,
+                        'street3Aggr': False,
+                        'street3Bets': 0,
+                        'street3CBChance': False,
+                        'street3CBDone': False,
+                        'street3Calls': 0,
+                        'street3CheckCallRaiseChance': False,
+                        'street3CheckCallRaiseDone': False,
+                        'street3Raises': 0,
+                        'street3Seen': False,
+                        'street4Aggr': False,
+                        'street4Bets': 0,
+                        'street4CBChance': False,
+                        'street4CBDone': False,
+                        'street4Calls': 0,
+                        'street4CheckCallRaiseChance': False,
+                        'street4CheckCallRaiseDone': False,
+                        'street4Raises': 0,
+                        'street4Seen': False,
+                        'totalProfit': 0,
+                        'tourneyTypeId': None,
+                        'tourneysPlayersIds': None,
+                        'winnings': 0,
+                        'wonAtSD': 0.0,
+                        'wonWhenSeenStreet1': 0.0,
+                        'wonWhenSeenStreet2': 0.0,
+                        'wonWhenSeenStreet3': 0.0,
+                        'wonWhenSeenStreet4': 0.0},
+    u'shleekom': {   'card1': 0,
+                     'card2': 0,
+                     'card3': 0,
+                     'card4': 0,
+                     'card5': 0,
+                     'card6': 0,
+                     'card7': 0,
+                     'foldBbToStealChance': False,
+                     'foldSbToStealChance': False,
+                     'foldToOtherRaisedStreet0': False,
+                     'foldToOtherRaisedStreet1': False,
+                     'foldToOtherRaisedStreet2': False,
+                     'foldToOtherRaisedStreet3': False,
+                     'foldToOtherRaisedStreet4': False,
+                     'foldToStreet1CBChance': False,
+                     'foldToStreet1CBDone': False,
+                     'foldToStreet2CBChance': False,
+                     'foldToStreet2CBDone': False,
+                     'foldToStreet3CBChance': False,
+                     'foldToStreet3CBDone': False,
+                     'foldToStreet4CBChance': False,
+                     'foldToStreet4CBDone': False,
+                     'foldedBbToSteal': False,
+                     'foldedSbToSteal': False,
+                     'other3BStreet0': False,
+                     'other4BStreet0': False,
+                     'otherRaisedStreet0': False,
+                     'otherRaisedStreet1': False,
+                     'otherRaisedStreet2': False,
+                     'otherRaisedStreet3': False,
+                     'otherRaisedStreet4': False,
+                     'position': 5,
+                     'raiseFirstInChance': True,
+                     'raisedFirstIn': False,
+                     'rake': 0,
+                     'sawShowdown': False,
+                     'seatNo': 8,
+                     'sitout': False,
+                     'startCards': 0,
+                     'startCash': 200,
+                     'street0Aggr': False,
+                     'street0Bets': 0,
+                     'street0Calls': 0,
+                     'street0Raises': 0,
+                     'street0VPI': False,
+                     'street0_3BChance': False,
+                     'street0_3BDone': False,
+                     'street0_4BChance': False,
+                     'street0_4BDone': False,
+                     'street1Aggr': False,
+                     'street1Bets': 0,
+                     'street1CBChance': False,
+                     'street1CBDone': False,
+                     'street1Calls': 0,
+                     'street1CheckCallRaiseChance': False,
+                     'street1CheckCallRaiseDone': False,
+                     'street1Raises': 0,
+                     'street1Seen': False,
+                     'street2Aggr': False,
+                     'street2Bets': 0,
+                     'street2CBChance': False,
+                     'street2CBDone': False,
+                     'street2Calls': 0,
+                     'street2CheckCallRaiseChance': False,
+                     'street2CheckCallRaiseDone': False,
+                     'street2Raises': 0,
+                     'street2Seen': False,
+                     'street3Aggr': False,
+                     'street3Bets': 0,
+                     'street3CBChance': False,
+                     'street3CBDone': False,
+                     'street3Calls': 0,
+                     'street3CheckCallRaiseChance': False,
+                     'street3CheckCallRaiseDone': False,
+                     'street3Raises': 0,
+                     'street3Seen': False,
+                     'street4Aggr': False,
+                     'street4Bets': 0,
+                     'street4CBChance': False,
+                     'street4CBDone': False,
+                     'street4Calls': 0,
+                     'street4CheckCallRaiseChance': False,
+                     'street4CheckCallRaiseDone': False,
+                     'street4Raises': 0,
+                     'street4Seen': False,
+                     'totalProfit': 0,
+                     'tourneyTypeId': None,
+                     'tourneysPlayersIds': None,
+                     'winnings': 0,
+                     'wonAtSD': 0.0,
+                     'wonWhenSeenStreet1': 0.0,
+                     'wonWhenSeenStreet2': 0.0,
+                     'wonWhenSeenStreet3': 0.0,
+                     'wonWhenSeenStreet4': 0.0},
+    u'stark00': {   'card1': 0,
+                    'card2': 0,
+                    'card3': 0,
+                    'card4': 0,
+                    'card5': 0,
+                    'card6': 0,
+                    'card7': 0,
+                    'foldBbToStealChance': False,
+                    'foldSbToStealChance': False,
+                    'foldToOtherRaisedStreet0': False,
+                    'foldToOtherRaisedStreet1': False,
+                    'foldToOtherRaisedStreet2': False,
+                    'foldToOtherRaisedStreet3': False,
+                    'foldToOtherRaisedStreet4': False,
+                    'foldToStreet1CBChance': False,
+                    'foldToStreet1CBDone': False,
+                    'foldToStreet2CBChance': False,
+                    'foldToStreet2CBDone': False,
+                    'foldToStreet3CBChance': False,
+                    'foldToStreet3CBDone': False,
+                    'foldToStreet4CBChance': False,
+                    'foldToStreet4CBDone': False,
+                    'foldedBbToSteal': False,
+                    'foldedSbToSteal': False,
+                    'other3BStreet0': False,
+                    'other4BStreet0': False,
+                    'otherRaisedStreet0': False,
+                    'otherRaisedStreet1': False,
+                    'otherRaisedStreet2': False,
+                    'otherRaisedStreet3': False,
+                    'otherRaisedStreet4': False,
+                    'position': 2,
+                    'raiseFirstInChance': True,
+                    'raisedFirstIn': False,
+                    'rake': 0,
+                    'sawShowdown': False,
+                    'seatNo': 2,
+                    'sitout': False,
+                    'startCards': 0,
+                    'startCash': 441,
+                    'street0Aggr': False,
+                    'street0Bets': 0,
+                    'street0Calls': 0,
+                    'street0Raises': 0,
+                    'street0VPI': False,
+                    'street0_3BChance': False,
+                    'street0_3BDone': False,
+                    'street0_4BChance': False,
+                    'street0_4BDone': False,
+                    'street1Aggr': False,
+                    'street1Bets': 0,
+                    'street1CBChance': False,
+                    'street1CBDone': False,
+                    'street1Calls': 0,
+                    'street1CheckCallRaiseChance': False,
+                    'street1CheckCallRaiseDone': False,
+                    'street1Raises': 0,
+                    'street1Seen': False,
+                    'street2Aggr': False,
+                    'street2Bets': 0,
+                    'street2CBChance': False,
+                    'street2CBDone': False,
+                    'street2Calls': 0,
+                    'street2CheckCallRaiseChance': False,
+                    'street2CheckCallRaiseDone': False,
+                    'street2Raises': 0,
+                    'street2Seen': False,
+                    'street3Aggr': False,
+                    'street3Bets': 0,
+                    'street3CBChance': False,
+                    'street3CBDone': False,
+                    'street3Calls': 0,
+                    'street3CheckCallRaiseChance': False,
+                    'street3CheckCallRaiseDone': False,
+                    'street3Raises': 0,
+                    'street3Seen': False,
+                    'street4Aggr': False,
+                    'street4Bets': 0,
+                    'street4CBChance': False,
+                    'street4CBDone': False,
+                    'street4Calls': 0,
+                    'street4CheckCallRaiseChance': False,
+                    'street4CheckCallRaiseDone': False,
+                    'street4Raises': 0,
+                    'street4Seen': False,
+                    'totalProfit': 0,
+                    'tourneyTypeId': None,
+                    'tourneysPlayersIds': None,
+                    'winnings': 0,
+                    'wonAtSD': 0.0,
+                    'wonWhenSeenStreet1': 0.0,
+                    'wonWhenSeenStreet2': 0.0,
+                    'wonWhenSeenStreet3': 0.0,
+                    'wonWhenSeenStreet4': 0.0},
+    u'vision': {   'card1': 0,
+                   'card2': 0,
+                   'card3': 0,
+                   'card4': 0,
+                   'card5': 0,
+                   'card6': 0,
+                   'card7': 0,
+                   'foldBbToStealChance': False,
+                   'foldSbToStealChance': False,
+                   'foldToOtherRaisedStreet0': False,
+                   'foldToOtherRaisedStreet1': False,
+                   'foldToOtherRaisedStreet2': False,
+                   'foldToOtherRaisedStreet3': False,
+                   'foldToOtherRaisedStreet4': False,
+                   'foldToStreet1CBChance': False,
+                   'foldToStreet1CBDone': False,
+                   'foldToStreet2CBChance': False,
+                   'foldToStreet2CBDone': False,
+                   'foldToStreet3CBChance': False,
+                   'foldToStreet3CBDone': False,
+                   'foldToStreet4CBChance': False,
+                   'foldToStreet4CBDone': False,
+                   'foldedBbToSteal': False,
+                   'foldedSbToSteal': False,
+                   'other3BStreet0': False,
+                   'other4BStreet0': False,
+                   'otherRaisedStreet0': False,
+                   'otherRaisedStreet1': False,
+                   'otherRaisedStreet2': False,
+                   'otherRaisedStreet3': False,
+                   'otherRaisedStreet4': False,
+                   'position': 6,
+                   'raiseFirstInChance': True,
+                   'raisedFirstIn': False,
+                   'rake': 0,
+                   'sawShowdown': False,
+                   'seatNo': 7,
+                   'sitout': False,
+                   'startCards': 0,
+                   'startCash': 297,
+                   'street0Aggr': False,
+                   'street0Bets': 0,
+                   'street0Calls': 0,
+                   'street0Raises': 0,
+                   'street0VPI': False,
+                   'street0_3BChance': False,
+                   'street0_3BDone': False,
+                   'street0_4BChance': False,
+                   'street0_4BDone': False,
+                   'street1Aggr': False,
+                   'street1Bets': 0,
+                   'street1CBChance': False,
+                   'street1CBDone': False,
+                   'street1Calls': 0,
+                   'street1CheckCallRaiseChance': False,
+                   'street1CheckCallRaiseDone': False,
+                   'street1Raises': 0,
+                   'street1Seen': False,
+                   'street2Aggr': False,
+                   'street2Bets': 0,
+                   'street2CBChance': False,
+                   'street2CBDone': False,
+                   'street2Calls': 0,
+                   'street2CheckCallRaiseChance': False,
+                   'street2CheckCallRaiseDone': False,
+                   'street2Raises': 0,
+                   'street2Seen': False,
+                   'street3Aggr': False,
+                   'street3Bets': 0,
+                   'street3CBChance': False,
+                   'street3CBDone': False,
+                   'street3Calls': 0,
+                   'street3CheckCallRaiseChance': False,
+                   'street3CheckCallRaiseDone': False,
+                   'street3Raises': 0,
+                   'street3Seen': False,
+                   'street4Aggr': False,
+                   'street4Bets': 0,
+                   'street4CBChance': False,
+                   'street4CBDone': False,
+                   'street4Calls': 0,
+                   'street4CheckCallRaiseChance': False,
+                   'street4CheckCallRaiseDone': False,
+                   'street4Raises': 0,
+                   'street4Seen': False,
+                   'totalProfit': 0,
+                   'tourneyTypeId': None,
+                   'tourneysPlayersIds': None,
+                   'winnings': 0,
+                   'wonAtSD': 0.0,
+                   'wonWhenSeenStreet1': 0.0,
+                   'wonWhenSeenStreet2': 0.0,
+                   'wonWhenSeenStreet3': 0.0,
+                   'wonWhenSeenStreet4': 0.0},
+    u'yrthligar': {   'card1': 0,
+                      'card2': 0,
+                      'card3': 0,
+                      'card4': 0,
+                      'card5': 0,
+                      'card6': 0,
+                      'card7': 0,
+                      'foldBbToStealChance': False,
+                      'foldSbToStealChance': False,
+                      'foldToOtherRaisedStreet0': False,
+                      'foldToOtherRaisedStreet1': False,
+                      'foldToOtherRaisedStreet2': False,
+                      'foldToOtherRaisedStreet3': False,
+                      'foldToOtherRaisedStreet4': False,
+                      'foldToStreet1CBChance': False,
+                      'foldToStreet1CBDone': False,
+                      'foldToStreet2CBChance': False,
+                      'foldToStreet2CBDone': False,
+                      'foldToStreet3CBChance': False,
+                      'foldToStreet3CBDone': False,
+                      'foldToStreet4CBChance': False,
+                      'foldToStreet4CBDone': False,
+                      'foldedBbToSteal': False,
+                      'foldedSbToSteal': False,
+                      'other3BStreet0': False,
+                      'other4BStreet0': False,
+                      'otherRaisedStreet0': False,
+                      'otherRaisedStreet1': False,
+                      'otherRaisedStreet2': False,
+                      'otherRaisedStreet3': False,
+                      'otherRaisedStreet4': False,
+                      'position': 0,
+                      'raiseFirstInChance': True,
+                      'raisedFirstIn': False,
+                      'rake': 0,
+                      'sawShowdown': False,
+                      'seatNo': 4,
+                      'sitout': False,
+                      'startCards': 0,
+                      'startCash': 1500,
+                      'street0Aggr': False,
+                      'street0Bets': 0,
+                      'street0Calls': 0,
+                      'street0Raises': 0,
+                      'street0VPI': False,
+                      'street0_3BChance': False,
+                      'street0_3BDone': False,
+                      'street0_4BChance': False,
+                      'street0_4BDone': False,
+                      'street1Aggr': False,
+                      'street1Bets': 0,
+                      'street1CBChance': False,
+                      'street1CBDone': False,
+                      'street1Calls': 0,
+                      'street1CheckCallRaiseChance': False,
+                      'street1CheckCallRaiseDone': False,
+                      'street1Raises': 0,
+                      'street1Seen': False,
+                      'street2Aggr': False,
+                      'street2Bets': 0,
+                      'street2CBChance': False,
+                      'street2CBDone': False,
+                      'street2Calls': 0,
+                      'street2CheckCallRaiseChance': False,
+                      'street2CheckCallRaiseDone': False,
+                      'street2Raises': 0,
+                      'street2Seen': False,
+                      'street3Aggr': False,
+                      'street3Bets': 0,
+                      'street3CBChance': False,
+                      'street3CBDone': False,
+                      'street3Calls': 0,
+                      'street3CheckCallRaiseChance': False,
+                      'street3CheckCallRaiseDone': False,
+                      'street3Raises': 0,
+                      'street3Seen': False,
+                      'street4Aggr': False,
+                      'street4Bets': 0,
+                      'street4CBChance': False,
+                      'street4CBDone': False,
+                      'street4Calls': 0,
+                      'street4CheckCallRaiseChance': False,
+                      'street4CheckCallRaiseDone': False,
+                      'street4Raises': 0,
+                      'street4Seen': False,
+                      'totalProfit': 0,
+                      'tourneyTypeId': None,
+                      'tourneysPlayersIds': None,
+                      'winnings': 0,
+                      'wonAtSD': 0.0,
+                      'wonWhenSeenStreet1': 0.0,
+                      'wonWhenSeenStreet2': 0.0,
+                      'wonWhenSeenStreet3': 0.0,
+                      'wonWhenSeenStreet4': 0.0}}

pyfpdb/regression-test-files/cash/FTP/Flop/PLO-6max-USD-0.01-0.02.201003.River.Showdown.txt.hp

@@ -0,0 +1,564 @@
+{   u'B_Isreal22': {   'card1': 0,
+                       'card2': 0,
+                       'card3': 0,
+                       'card4': 0,
+                       'card5': 0,
+                       'card6': 0,
+                       'card7': 0,
+                       'foldBbToStealChance': False,
+                       'foldSbToStealChance': False,
+                       'foldToOtherRaisedStreet0': False,
+                       'foldToOtherRaisedStreet1': True,
+                       'foldToOtherRaisedStreet2': False,
+                       'foldToOtherRaisedStreet3': False,
+                       'foldToOtherRaisedStreet4': False,
+                       'foldToStreet1CBChance': False,
+                       'foldToStreet1CBDone': False,
+                       'foldToStreet2CBChance': False,
+                       'foldToStreet2CBDone': False,
+                       'foldToStreet3CBChance': False,
+                       'foldToStreet3CBDone': False,
+                       'foldToStreet4CBChance': False,
+                       'foldToStreet4CBDone': False,
+                       'foldedBbToSteal': False,
+                       'foldedSbToSteal': False,
+                       'other3BStreet0': False,
+                       'other4BStreet0': False,
+                       'otherRaisedStreet0': False,
+                       'otherRaisedStreet1': True,
+                       'otherRaisedStreet2': False,
+                       'otherRaisedStreet3': False,
+                       'otherRaisedStreet4': False,
+                       'position': 'S',
+                       'raiseFirstInChance': False,
+                       'raisedFirstIn': False,
+                       'rake': 0,
+                       'sawShowdown': False,
+                       'seatNo': 2,
+                       'sitout': False,
+                       'startCards': 0,
+                       'startCash': 241,
+                       'street0Aggr': False,
+                       'street0Bets': 0,
+                       'street0Calls': 1,
+                       'street0Raises': 0,
+                       'street0VPI': True,
+                       'street0_3BChance': False,
+                       'street0_3BDone': False,
+                       'street0_4BChance': False,
+                       'street0_4BDone': False,
+                       'street1Aggr': False,
+                       'street1Bets': 0,
+                       'street1CBChance': False,
+                       'street1CBDone': False,
+                       'street1Calls': 0,
+                       'street1CheckCallRaiseChance': False,
+                       'street1CheckCallRaiseDone': False,
+                       'street1Raises': 0,
+                       'street1Seen': True,
+                       'street2Aggr': False,
+                       'street2Bets': 0,
+                       'street2CBChance': False,
+                       'street2CBDone': False,
+                       'street2Calls': 0,
+                       'street2CheckCallRaiseChance': True,
+                       'street2CheckCallRaiseDone': False,
+                       'street2Raises': 0,
+                       'street2Seen': False,
+                       'street3Aggr': False,
+                       'street3Bets': 0,
+                       'street3CBChance': False,
+                       'street3CBDone': False,
+                       'street3Calls': 0,
+                       'street3CheckCallRaiseChance': False,
+                       'street3CheckCallRaiseDone': False,
+                       'street3Raises': 0,
+                       'street3Seen': False,
+                       'street4Aggr': False,
+                       'street4Bets': 0,
+                       'street4CBChance': False,
+                       'street4CBDone': False,
+                       'street4Calls': 0,
+                       'street4CheckCallRaiseChance': False,
+                       'street4CheckCallRaiseDone': False,
+                       'street4Raises': 0,
+                       'street4Seen': False,
+                       'totalProfit': -2,
+                       'tourneyTypeId': None,
+                       'tourneysPlayersIds': None,
+                       'winnings': 0,
+                       'wonAtSD': 0.0,
+                       'wonWhenSeenStreet1': 0.0,
+                       'wonWhenSeenStreet2': 0.0,
+                       'wonWhenSeenStreet3': 0.0,
+                       'wonWhenSeenStreet4': 0.0},
+    u'DrZartinger': {   'card1': 0,
+                        'card2': 0,
+                        'card3': 0,
+                        'card4': 0,
+                        'card5': 0,
+                        'card6': 0,
+                        'card7': 0,
+                        'foldBbToStealChance': False,
+                        'foldSbToStealChance': False,
+                        'foldToOtherRaisedStreet0': False,
+                        'foldToOtherRaisedStreet1': False,
+                        'foldToOtherRaisedStreet2': False,
+                        'foldToOtherRaisedStreet3': False,
+                        'foldToOtherRaisedStreet4': False,
+                        'foldToStreet1CBChance': False,
+                        'foldToStreet1CBDone': False,
+                        'foldToStreet2CBChance': False,
+                        'foldToStreet2CBDone': False,
+                        'foldToStreet3CBChance': False,
+                        'foldToStreet3CBDone': False,
+                        'foldToStreet4CBChance': False,
+                        'foldToStreet4CBDone': False,
+                        'foldedBbToSteal': False,
+                        'foldedSbToSteal': False,
+                        'other3BStreet0': False,
+                        'other4BStreet0': False,
+                        'otherRaisedStreet0': False,
+                        'otherRaisedStreet1': False,
+                        'otherRaisedStreet2': False,
+                        'otherRaisedStreet3': False,
+                        'otherRaisedStreet4': False,
+                        'position': 1,
+                        'raiseFirstInChance': False,
+                        'raisedFirstIn': False,
+                        'rake': 0,
+                        'sawShowdown': False,
+                        'seatNo': 6,
+                        'sitout': False,
+                        'startCards': 0,
+                        'startCash': 155,
+                        'street0Aggr': False,
+                        'street0Bets': 0,
+                        'street0Calls': 0,
+                        'street0Raises': 0,
+                        'street0VPI': False,
+                        'street0_3BChance': False,
+                        'street0_3BDone': False,
+                        'street0_4BChance': False,
+                        'street0_4BDone': False,
+                        'street1Aggr': False,
+                        'street1Bets': 0,
+                        'street1CBChance': False,
+                        'street1CBDone': False,
+                        'street1Calls': 0,
+                        'street1CheckCallRaiseChance': False,
+                        'street1CheckCallRaiseDone': False,
+                        'street1Raises': 0,
+                        'street1Seen': False,
+                        'street2Aggr': False,
+                        'street2Bets': 0,
+                        'street2CBChance': False,
+                        'street2CBDone': False,
+                        'street2Calls': 0,
+                        'street2CheckCallRaiseChance': False,
+                        'street2CheckCallRaiseDone': False,
+                        'street2Raises': 0,
+                        'street2Seen': False,
+                        'street3Aggr': False,
+                        'street3Bets': 0,
+                        'street3CBChance': False,
+                        'street3CBDone': False,
+                        'street3Calls': 0,
+                        'street3CheckCallRaiseChance': False,
+                        'street3CheckCallRaiseDone': False,
+                        'street3Raises': 0,
+                        'street3Seen': False,
+                        'street4Aggr': False,
+                        'street4Bets': 0,
+                        'street4CBChance': False,
+                        'street4CBDone': False,
+                        'street4Calls': 0,
+                        'street4CheckCallRaiseChance': False,
+                        'street4CheckCallRaiseDone': False,
+                        'street4Raises': 0,
+                        'street4Seen': False,
+                        'totalProfit': 0,
+                        'tourneyTypeId': None,
+                        'tourneysPlayersIds': None,
+                        'winnings': 0,
+                        'wonAtSD': 0.0,
+                        'wonWhenSeenStreet1': 0.0,
+                        'wonWhenSeenStreet2': 0.0,
+                        'wonWhenSeenStreet3': 0.0,
+                        'wonWhenSeenStreet4': 0.0},
+    u'ShaDiv': {   'card1': 0,
+                   'card2': 0,
+                   'card3': 0,
+                   'card4': 0,
+                   'card5': 0,
+                   'card6': 0,
+                   'card7': 0,
+                   'foldBbToStealChance': False,
+                   'foldSbToStealChance': False,
+                   'foldToOtherRaisedStreet0': False,
+                   'foldToOtherRaisedStreet1': False,
+                   'foldToOtherRaisedStreet2': False,
+                   'foldToOtherRaisedStreet3': True,
+                   'foldToOtherRaisedStreet4': False,
+                   'foldToStreet1CBChance': False,
+                   'foldToStreet1CBDone': False,
+                   'foldToStreet2CBChance': False,
+                   'foldToStreet2CBDone': False,
+                   'foldToStreet3CBChance': False,
+                   'foldToStreet3CBDone': False,
+                   'foldToStreet4CBChance': False,
+                   'foldToStreet4CBDone': False,
+                   'foldedBbToSteal': False,
+                   'foldedSbToSteal': False,
+                   'other3BStreet0': False,
+                   'other4BStreet0': False,
+                   'otherRaisedStreet0': False,
+                   'otherRaisedStreet1': True,
+                   'otherRaisedStreet2': False,
+                   'otherRaisedStreet3': True,
+                   'otherRaisedStreet4': False,
+                   'position': 'B',
+                   'raiseFirstInChance': False,
+                   'raisedFirstIn': False,
+                   'rake': 0,
+                   'sawShowdown': False,
+                   'seatNo': 3,
+                   'sitout': False,
+                   'startCards': 0,
+                   'startCash': 277,
+                   'street0Aggr': False,
+                   'street0Bets': 0,
+                   'street0Calls': 0,
+                   'street0Raises': 0,
+                   'street0VPI': False,
+                   'street0_3BChance': False,
+                   'street0_3BDone': False,
+                   'street0_4BChance': False,
+                   'street0_4BDone': False,
+                   'street1Aggr': False,
+                   'street1Bets': 0,
+                   'street1CBChance': False,
+                   'street1CBDone': False,
+                   'street1Calls': 1,
+                   'street1CheckCallRaiseChance': False,
+                   'street1CheckCallRaiseDone': False,
+                   'street1Raises': 0,
+                   'street1Seen': True,
+                   'street2Aggr': True,
+                   'street2Bets': 1,
+                   'street2CBChance': False,
+                   'street2CBDone': False,
+                   'street2Calls': 0,
+                   'street2CheckCallRaiseChance': True,
+                   'street2CheckCallRaiseDone': True,
+                   'street2Raises': 0,
+                   'street2Seen': True,
+                   'street3Aggr': False,
+                   'street3Bets': 0,
+                   'street3CBChance': True,
+                   'street3CBDone': False,
+                   'street3Calls': 0,
+                   'street3CheckCallRaiseChance': False,
+                   'street3CheckCallRaiseDone': False,
+                   'street3Raises': 0,
+                   'street3Seen': True,
+                   'street4Aggr': False,
+                   'street4Bets': 0,
+                   'street4CBChance': False,
+                   'street4CBDone': False,
+                   'street4Calls': 0,
+                   'street4CheckCallRaiseChance': False,
+                   'street4CheckCallRaiseDone': False,
+                   'street4Raises': 0,
+                   'street4Seen': False,
+                   'totalProfit': -16,
+                   'tourneyTypeId': None,
+                   'tourneysPlayersIds': None,
+                   'winnings': 0,
+                   'wonAtSD': 0.0,
+                   'wonWhenSeenStreet1': 0.0,
+                   'wonWhenSeenStreet2': 0.0,
+                   'wonWhenSeenStreet3': 0.0,
+                   'wonWhenSeenStreet4': 0.0},
+    u'Sorrowful': {   'card1': 15,
+                      'card2': 10,
+                      'card3': 42,
+                      'card4': 25,
+                      'card5': 0,
+                      'card6': 0,
+                      'card7': 0,
+                      'foldBbToStealChance': False,
+                      'foldSbToStealChance': False,
+                      'foldToOtherRaisedStreet0': False,
+                      'foldToOtherRaisedStreet1': False,
+                      'foldToOtherRaisedStreet2': False,
+                      'foldToOtherRaisedStreet3': False,
+                      'foldToOtherRaisedStreet4': False,
+                      'foldToStreet1CBChance': False,
+                      'foldToStreet1CBDone': False,
+                      'foldToStreet2CBChance': False,
+                      'foldToStreet2CBDone': False,
+                      'foldToStreet3CBChance': False,
+                      'foldToStreet3CBDone': False,
+                      'foldToStreet4CBChance': False,
+                      'foldToStreet4CBDone': False,
+                      'foldedBbToSteal': False,
+                      'foldedSbToSteal': False,
+                      'other3BStreet0': False,
+                      'other4BStreet0': False,
+                      'otherRaisedStreet0': False,
+                      'otherRaisedStreet1': False,
+                      'otherRaisedStreet2': False,
+                      'otherRaisedStreet3': False,
+                      'otherRaisedStreet4': False,
+                      'position': 0,
+                      'raiseFirstInChance': False,
+                      'raisedFirstIn': False,
+                      'rake': 0,
+                      'sawShowdown': False,
+                      'seatNo': 1,
+                      'sitout': False,
+                      'startCards': 0,
+                      'startCash': 209,
+                      'street0Aggr': False,
+                      'street0Bets': 0,
+                      'street0Calls': 0,
+                      'street0Raises': 0,
+                      'street0VPI': False,
+                      'street0_3BChance': False,
+                      'street0_3BDone': False,
+                      'street0_4BChance': False,
+                      'street0_4BDone': False,
+                      'street1Aggr': False,
+                      'street1Bets': 0,
+                      'street1CBChance': False,
+                      'street1CBDone': False,
+                      'street1Calls': 0,
+                      'street1CheckCallRaiseChance': False,
+                      'street1CheckCallRaiseDone': False,
+                      'street1Raises': 0,
+                      'street1Seen': False,
+                      'street2Aggr': False,
+                      'street2Bets': 0,
+                      'street2CBChance': False,
+                      'street2CBDone': False,
+                      'street2Calls': 0,
+                      'street2CheckCallRaiseChance': False,
+                      'street2CheckCallRaiseDone': False,
+                      'street2Raises': 0,
+                      'street2Seen': False,
+                      'street3Aggr': False,
+                      'street3Bets': 0,
+                      'street3CBChance': False,
+                      'street3CBDone': False,
+                      'street3Calls': 0,
+                      'street3CheckCallRaiseChance': False,
+                      'street3CheckCallRaiseDone': False,
+                      'street3Raises': 0,
+                      'street3Seen': False,
+                      'street4Aggr': False,
+                      'street4Bets': 0,
+                      'street4CBChance': False,
+                      'street4CBDone': False,
+                      'street4Calls': 0,
+                      'street4CheckCallRaiseChance': False,
+                      'street4CheckCallRaiseDone': False,
+                      'street4Raises': 0,
+                      'street4Seen': False,
+                      'totalProfit': 0,
+                      'tourneyTypeId': None,
+                      'tourneysPlayersIds': None,
+                      'winnings': 0,
+                      'wonAtSD': 0.0,
+                      'wonWhenSeenStreet1': 0.0,
+                      'wonWhenSeenStreet2': 0.0,
+                      'wonWhenSeenStreet3': 0.0,
+                      'wonWhenSeenStreet4': 0.0},
+    u'Timoha777': {   'card1': 24,
+                      'card2': 23,
+                      'card3': 16,
+                      'card4': 50,
+                      'card5': 0,
+                      'card6': 0,
+                      'card7': 0,
+                      'foldBbToStealChance': False,
+                      'foldSbToStealChance': False,
+                      'foldToOtherRaisedStreet0': False,
+                      'foldToOtherRaisedStreet1': False,
+                      'foldToOtherRaisedStreet2': False,
+                      'foldToOtherRaisedStreet3': False,
+                      'foldToOtherRaisedStreet4': False,
+                      'foldToStreet1CBChance': False,
+                      'foldToStreet1CBDone': False,
+                      'foldToStreet2CBChance': False,
+                      'foldToStreet2CBDone': False,
+                      'foldToStreet3CBChance': False,
+                      'foldToStreet3CBDone': False,
+                      'foldToStreet4CBChance': False,
+                      'foldToStreet4CBDone': False,
+                      'foldedBbToSteal': False,
+                      'foldedSbToSteal': False,
+                      'other3BStreet0': False,
+                      'other4BStreet0': False,
+                      'otherRaisedStreet0': False,
+                      'otherRaisedStreet1': True,
+                      'otherRaisedStreet2': True,
+                      'otherRaisedStreet3': True,
+                      'otherRaisedStreet4': False,
+                      'position': 2,
+                      'raiseFirstInChance': False,
+                      'raisedFirstIn': False,
+                      'rake': 6,
+                      'sawShowdown': True,
+                      'seatNo': 5,
+                      'sitout': False,
+                      'startCards': 0,
+                      'startCash': 98,
+                      'street0Aggr': False,
+                      'street0Bets': 0,
+                      'street0Calls': 1,
+                      'street0Raises': 0,
+                      'street0VPI': True,
+                      'street0_3BChance': False,
+                      'street0_3BDone': False,
+                      'street0_4BChance': False,
+                      'street0_4BDone': False,
+                      'street1Aggr': False,
+                      'street1Bets': 0,
+                      'street1CBChance': False,
+                      'street1CBDone': False,
+                      'street1Calls': 1,
+                      'street1CheckCallRaiseChance': False,
+                      'street1CheckCallRaiseDone': False,
+                      'street1Raises': 0,
+                      'street1Seen': True,
+                      'street2Aggr': False,
+                      'street2Bets': 0,
+                      'street2CBChance': False,
+                      'street2CBDone': False,
+                      'street2Calls': 1,
+                      'street2CheckCallRaiseChance': False,
+                      'street2CheckCallRaiseDone': False,
+                      'street2Raises': 0,
+                      'street2Seen': True,
+                      'street3Aggr': False,
+                      'street3Bets': 0,
+                      'street3CBChance': False,
+                      'street3CBDone': False,
+                      'street3Calls': 1,
+                      'street3CheckCallRaiseChance': False,
+                      'street3CheckCallRaiseDone': False,
+                      'street3Raises': 0,
+                      'street3Seen': True,
+                      'street4Aggr': False,
+                      'street4Bets': 0,
+                      'street4CBChance': False,
+                      'street4CBDone': False,
+                      'street4Calls': 0,
+                      'street4CheckCallRaiseChance': False,
+                      'street4CheckCallRaiseDone': False,
+                      'street4Raises': 0,
+                      'street4Seen': False,
+                      'totalProfit': 53,
+                      'tourneyTypeId': None,
+                      'tourneysPlayersIds': None,
+                      'winnings': 94,
+                      'wonAtSD': 1.0,
+                      'wonWhenSeenStreet1': 1.0,
+                      'wonWhenSeenStreet2': 0.0,
+                      'wonWhenSeenStreet3': 0.0,
+                      'wonWhenSeenStreet4': 0.0},
+    u'rockinalex': {   'card1': 49,
+                       'card2': 31,
+                       'card3': 19,
+                       'card4': 39,
+                       'card5': 0,
+                       'card6': 0,
+                       'card7': 0,
+                       'foldBbToStealChance': False,
+                       'foldSbToStealChance': False,
+                       'foldToOtherRaisedStreet0': False,
+                       'foldToOtherRaisedStreet1': False,
+                       'foldToOtherRaisedStreet2': False,
+                       'foldToOtherRaisedStreet3': False,
+                       'foldToOtherRaisedStreet4': False,
+                       'foldToStreet1CBChance': False,
+                       'foldToStreet1CBDone': False,
+                       'foldToStreet2CBChance': False,
+                       'foldToStreet2CBDone': False,
+                       'foldToStreet3CBChance': False,
+                       'foldToStreet3CBDone': False,
+                       'foldToStreet4CBChance': False,
+                       'foldToStreet4CBDone': False,
+                       'foldedBbToSteal': False,
+                       'foldedSbToSteal': False,
+                       'other3BStreet0': False,
+                       'other4BStreet0': False,
+                       'otherRaisedStreet0': False,
+                       'otherRaisedStreet1': False,
+                       'otherRaisedStreet2': True,
+                       'otherRaisedStreet3': False,
+                       'otherRaisedStreet4': False,
+                       'position': 3,
+                       'raiseFirstInChance': True,
+                       'raisedFirstIn': False,
+                       'rake': 0,
+                       'sawShowdown': True,
+                       'seatNo': 4,
+                       'sitout': False,
+                       'startCards': 0,
+                       'startCash': 200,
+                       'street0Aggr': False,
+                       'street0Bets': 0,
+                       'street0Calls': 1,
+                       'street0Raises': 0,
+                       'street0VPI': True,
+                       'street0_3BChance': False,
+                       'street0_3BDone': False,
+                       'street0_4BChance': False,
+                       'street0_4BDone': False,
+                       'street1Aggr': True,
+                       'street1Bets': 1,
+                       'street1CBChance': False,
+                       'street1CBDone': False,
+                       'street1Calls': 0,
+                       'street1CheckCallRaiseChance': False,
+                       'street1CheckCallRaiseDone': False,
+                       'street1Raises': 0,
+                       'street1Seen': True,
+                       'street2Aggr': False,
+                       'street2Bets': 0,
+                       'street2CBChance': False,
+                       'street2CBDone': False,
+                       'street2Calls': 1,
+                       'street2CheckCallRaiseChance': False,
+                       'street2CheckCallRaiseDone': False,
+                       'street2Raises': 0,
+                       'street2Seen': True,
+                       'street3Aggr': True,
+                       'street3Bets': 1,
+                       'street3CBChance': False,
+                       'street3CBDone': False,
+                       'street3Calls': 0,
+                       'street3CheckCallRaiseChance': False,
+                       'street3CheckCallRaiseDone': False,
+                       'street3Raises': 0,
+                       'street3Seen': True,
+                       'street4Aggr': False,
+                       'street4Bets': 0,
+                       'street4CBChance': False,
+                       'street4CBDone': False,
+                       'street4Calls': 0,
+                       'street4CheckCallRaiseChance': False,
+                       'street4CheckCallRaiseDone': False,
+                       'street4Raises': 0,
+                       'street4Seen': False,
+                       'totalProfit': -41,
+                       'tourneyTypeId': None,
+                       'tourneysPlayersIds': None,
+                       'winnings': 0,
+                       'wonAtSD': 0.0,
+                       'wonWhenSeenStreet1': 0.0,
+                       'wonWhenSeenStreet2': 0.0,
+                       'wonWhenSeenStreet3': 0.0,
+                       'wonWhenSeenStreet4': 0.0}}

pyfpdb/regression-test-files/cash/OnGame/NLHE-9max-USD-0.05-0.10-201008.Betfair.Skin.txt

@@ -0,0 +1,41 @@
+***** History for hand R5-70000684-006 *****
+Start hand: Wed Aug 11 03:21:00 GMT+0100 2010
+Table: Kassel [73910684] (NO_LIMIT TEXAS_HOLDEM 0.05/0.10, Real money)
+User: Player3
+Button: seat 8
+Players in round: 5
+Seat 9: Player1 (4.35)
+Seat 3: Player0 (10.90)
+Seat 5: Player2 (12.88)
+Seat 6: Player3 (14.18)
+Seat 8: Player4 (9)
+Player1 posts small blind (0.05)
+Player0 posts big blind (0.10)
+---
+Dealing pocket cards
+Dealing to Player3: [6s, 7h]
+Player2 folds
+Player3 folds
+Player4 raises 0.30 to 0.30
+Player1 calls 0.25
+Player0 folds
+--- Dealing flop [8c, Ts, 4d]
+Player1 checks
+Player4 checks
+--- Dealing turn [Ac]
+Player1 bets 0.10
+Player4 calls 0.10
+--- Dealing river [5d]
+Player1 bets 0.10
+Player4 folds
+---
+Summary:
+Main pot: 0.90 won by Player1 (0.86)
+Rake taken: $0.04
+Seat 9: Player1 (4.81), net: +0.46
+Seat 3: Player0 (10.80), net: -0.10
+Seat 5: Player2 (12.88)
+Seat 6: Player3 (14.18)
+Seat 8: Player4 (8.60), net: -0.40
+***** End of hand R5-73910684-276 *****
+

pyfpdb/regression-test-files/cash/Stars/Draw/NLSDraw-USD-0.25-0.50-201009.Mucked.cards.txt

@@ -0,0 +1,40 @@
+PokerStars Game #48974407184:  Single Draw 2-7 Lowball No Limit ($0.25/$0.50 USD) - 2010/09/01 9:49:52 ET
+Table 'Eucharis II' 7-max Seat #4 is the button
+Seat 1: Philippus40 ($60.90 in chips) 
+Seat 2: barbus533 ($21.15 in chips) 
+Seat 3: @sker86 ($82.60 in chips) 
+Seat 4: nl pokerr ($49.15 in chips) 
+Seat 5: heliodorus ($73.45 in chips) 
+Seat 6: s0rrow ($20 in chips) 
+Seat 7: KBH7 ($14 in chips) 
+heliodorus: posts small blind $0.25
+s0rrow: posts big blind $0.50
+*** DEALING HANDS ***
+Dealt to s0rrow [2s 7d 4d 6d 8s]
+KBH7: folds 
+Philippus40: folds 
+barbus533: folds 
+@sker86: raises $1.50 to $2
+nl pokerr: folds 
+heliodorus: folds 
+s0rrow: calls $1.50
+s0rrow: stands pat on [2s 7d 4d 6d 8s]
+@sker86: discards 1 card
+s0rrow: checks 
+@sker86: checks 
+*** SHOW DOWN ***
+s0rrow: shows [2s 7d 4d 6d 8s] (Lo: 8,7,6,4,2)
+@sker86: mucks hand 
+s0rrow collected $4.05 from pot
+*** SUMMARY ***
+Total pot $4.25 | Rake $0.20 
+Seat 1: Philippus40 folded before Flop (didn't bet)
+Seat 2: barbus533 folded before Flop (didn't bet)
+Seat 3: @sker86 mucked [2h 8d 7h 7s 4s]
+Seat 4: nl pokerr (button) folded before Flop (didn't bet)
+Seat 5: heliodorus (small blind) folded before Flop
+Seat 6: s0rrow (big blind) showed [2s 7d 4d 6d 8s] and won ($4.05) with Lo: 8,7,6,4,2
+Seat 7: KBH7 folded before Flop (didn't bet)
+
+
+