diff --git a/pyfpdb/HandHistoryConverter.pyc b/pyfpdb/HandHistoryConverter.pyc new file mode 100644 index 00000000..cecce850 Binary files /dev/null and b/pyfpdb/HandHistoryConverter.pyc differ diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py index a8591041..ddd6b30a 100644 --- a/pyfpdb/Hud.py +++ b/pyfpdb/Hud.py @@ -45,10 +45,10 @@ import Mucked import Database import HUD_main -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: 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[0-9]+):\s+(HORSE)? \(?(?PHold\'em|Razz|7 Card Stud|Omaha Hi/Lo) (?PNo Limit|Limit|Pot Limit),? \(?(?P\$|)?(?P[.0-9]+)/\$?(?P[.0-9]+)\) - (?P.*$)', re.MULTILINE) + re_GameInfo = re.compile("PokerStars Game #(?P[0-9]+):\s+(HORSE)? \(?(?PHold\'em|Razz|7 Card Stud|Omaha Hi/Lo|Badugi) (?PNo Limit|Limit|Pot Limit),? \(?(?P\$|)?(?P[.0-9]+)/\$?(?P[.0-9]+)\) - (?P.*$)", re.MULTILINE) re_SplitHands = re.compile('\n\n+') re_HandInfo = re.compile("^Table \'(?P[- a-zA-Z]+)\'(?P.+?$)?", re.MULTILINE) re_Button = re.compile('Seat #(?P