From bbdbe7e47dd0bcb9457ec4856a5252097425382a Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 14 Mar 2009 05:10:13 +0900
Subject: [PATCH 1/4] Remove TODO for previous patch

---
 pyfpdb/fpdb_import.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyfpdb/fpdb_import.py b/pyfpdb/fpdb_import.py
index 8c4bd0f9..ef0894e3 100644
--- a/pyfpdb/fpdb_import.py
+++ b/pyfpdb/fpdb_import.py
@@ -226,7 +226,6 @@ class Importer:
             conv = None
             # Load filter, process file, pass returned filename to import_fpdb_file
             
-            # TODO: Shouldn't we be able to use some sort of lambda or something to just call a Python object by whatever name we specify? then we don't have to hardcode them,
             print "converting %s" % file
             hhbase    = self.config.get_import_parameters().get("hhArchiveBase")
             hhbase    = os.path.expanduser(hhbase)

From d3103f099e7a0abd982cb5e6f1e11f4eb46eac76 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 14 Mar 2009 06:42:20 +0900
Subject: [PATCH 2/4] Make Stars Badugi recognised

---
 pyfpdb/PokerStarsToFpdb.py | 5 +++--
 pyfpdb/test_FullTilt.py    | 2 +-
 pyfpdb/test_PokerStars.py  | 5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py
index 05027121..8c2e4884 100755
--- a/pyfpdb/PokerStarsToFpdb.py
+++ b/pyfpdb/PokerStarsToFpdb.py
@@ -69,7 +69,7 @@ from HandHistoryConverter import *
 class PokerStars(HandHistoryConverter):
     
     # Static regexes
-    re_GameInfo     = re.compile('PokerStars Game #(?P<HID>[0-9]+):\s+(HORSE)? \(?(?P<GAME>Hold\'em|Razz|7 Card Stud|Omaha Hi/Lo) (?P<LIMIT>No Limit|Limit|Pot Limit),? \(?(?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)\) - (?P<DATETIME>.*$)', re.MULTILINE)
+    re_GameInfo     = re.compile("PokerStars Game #(?P<HID>[0-9]+):\s+(HORSE)? \(?(?P<GAME>Hold\'em|Razz|7 Card Stud|Omaha Hi/Lo|Badugi) (?P<LIMIT>No Limit|Limit|Pot Limit),? \(?(?P<CURRENCY>\$|)?(?P<SB>[.0-9]+)/\$?(?P<BB>[.0-9]+)\) - (?P<DATETIME>.*$)", re.MULTILINE)
     re_SplitHands   = re.compile('\n\n+')
     re_HandInfo     = re.compile("^Table \'(?P<TABLE>[- a-zA-Z]+)\'(?P<TABLEATTRIBUTES>.+?$)?", re.MULTILINE)
     re_Button       = re.compile('Seat #(?P<BUTTON>\d+) is the button', re.MULTILINE)
@@ -129,7 +129,8 @@ follow :  whether to tail -f the input"""
                  'Omaha Hi' : ('hold','omahahi'),
               'Omaha Hi/Lo' : ('hold','omahahilo'),
                      'Razz' : ('stud','razz'), 
-              '7 Card Stud' : ('stud','studhi')
+              '7 Card Stud' : ('stud','studhi'),
+                   'Badugi' : ('draw','badugi')
                }
         currencies = { u'€':'EUR', '$':'USD', '':'T$' }
         if 'LIMIT' in mg:
diff --git a/pyfpdb/test_FullTilt.py b/pyfpdb/test_FullTilt.py
index 24183bc9..f53b3b43 100644
--- a/pyfpdb/test_FullTilt.py
+++ b/pyfpdb/test_FullTilt.py
@@ -7,7 +7,7 @@ def checkGameInfo(hhc, header, info):
     assert hhc.determineGameType(header) == info
 
 def testGameInfo():
-    hhc = FulltiltToFpdb.FullTilt(autostart=False)    
+    hhc = FulltiltToFpdb.Fulltilt(autostart=False)
     pairs = (
     ("Full Tilt Poker Game #10777181585: Table Deerfly (deep 6) - $0.01/$0.02 - Pot Limit Omaha Hi - 2:24:44 ET - 2009/02/22",
             {'type':'ring', 'base':'hold', 'category':'omahahi', 'limitType':'pl', 'sb':'0.01', 'bb':'0.02', 'currency':'USD'}),
diff --git a/pyfpdb/test_PokerStars.py b/pyfpdb/test_PokerStars.py
index f9c1903b..06de1078 100644
--- a/pyfpdb/test_PokerStars.py
+++ b/pyfpdb/test_PokerStars.py
@@ -13,7 +13,10 @@ def testGameInfo():
     {'type':'ring', 'base':"hold", 'category':'holdem', 'limitType':'nl', 'sb':'1', 'bb':'2', 'currency':'USD'}),
          
     (u"PokerStars Game #5999635897:  HORSE (Omaha Hi/Lo Limit, $2/$4) - 2006/08/21 - 13:59:19 (ET)",
-    {'type':'ring', 'base':'hold', 'category':'omahahilo', 'limitType':'fl', 'sb':'2', 'bb':'4','currency':'USD'})
+    {'type':'ring', 'base':'hold', 'category':'omahahilo', 'limitType':'fl', 'sb':'2', 'bb':'4','currency':'USD'}),
+
+    (u"PokerStars Game #25923772706:  Badugi Limit ($0.25/$0.50) - 2009/03/13 16:40:58 ET",
+    {'type':'ring', 'base':'draw', 'category':'badugi', 'limitType':'fl', 'sb':'0.25', 'bb':'0.50','currency':'USD'})
     )
     for (header, info) in pairs:
         yield checkGameInfo, hhc, header, info

From 9cdfa5f279c13388be4ebd09973515834f39407e Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 14 Mar 2009 11:06:47 +0900
Subject: [PATCH 3/4] Remove 3rd arg from Hud module loader

Mea culpa
---
 pyfpdb/Hud.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index c9e0ea07..09c45a3b 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -46,10 +46,10 @@ import Database
 import HUD_main
 import Utils
 
-def importName(module_name, name, params):
+def importName(module_name, name):
     """Import a named object 'name' from module 'module_name'."""
 #    Recipe 16.3 in the Python Cookbook, 2nd ed.  Thanks!!!!
-# Modded by Carl G to support additional params
+
     try:
         module = __import__(module_name, globals(), locals(), [name])
     except:

From d389706e85183cd70a561cba332b658eb24c1a46 Mon Sep 17 00:00:00 2001
From: Worros <carl.gherardi@gmail.com>
Date: Sat, 14 Mar 2009 11:21:23 +0900
Subject: [PATCH 4/4] Revert dodgy import line

---
 pyfpdb/Hud.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index 09c45a3b..ddd6b30a 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -44,7 +44,6 @@ import Stats
 import Mucked
 import Database
 import HUD_main
-import Utils
 
 def importName(module_name, name):
     """Import a named object 'name' from module 'module_name'."""