diff --git a/gfx/fpdb_large_icon.ico b/gfx/fpdb_large_icon.ico new file mode 100644 index 00000000..6be85f1c Binary files /dev/null and b/gfx/fpdb_large_icon.ico differ diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index 143fb72b..7b026f0c 100755 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -171,6 +171,10 @@ if LOCALE_ENCODING == "US-ASCII": # needs LOCALE_ENCODING (above), imported for sqlite setup in Config class below + +FROZEN = hasattr(sys, "frozen") +EXEC_PATH = get_exec_path() + import Charset @@ -618,7 +622,11 @@ class Config: def save(self, file = None): if file is None: file = self.file - shutil.move(file, file+".backup") + try: + shutil.move(file, file+".backup") + except: + pass + with open(file, 'w') as f: self.doc.writexml(f) @@ -1035,3 +1043,9 @@ if __name__== "__main__": PrettyPrint(site_node, stream=sys.stdout, encoding="utf-8") except: print "xml.dom.ext needs PyXML to be installed!" + + print "FROZEN =", FROZEN + print "EXEC_PATH =", EXEC_PATH + + print "press enter to end" + sys.stdin.readline() diff --git a/pyfpdb/EverleafToFpdb.py b/pyfpdb/EverleafToFpdb.py index ad9d0524..5dd8d041 100755 --- a/pyfpdb/EverleafToFpdb.py +++ b/pyfpdb/EverleafToFpdb.py @@ -38,8 +38,9 @@ class Everleaf(HandHistoryConverter): #re.compile(ur"^(Blinds )?(?P\$| €|)(?P[.0-9]+)/(?:\$| €)?(?P[.0-9]+) (?PNL|PL|) (?P(Hold\'em|Omaha|7 Card Stud))", re.MULTILINE) re_HandInfo = re.compile(ur".*#(?P[0-9]+)\n.*\n(Blinds )?(?:\$| €|)(?P[.0-9]+)/(?:\$| €|)(?P[.0-9]+) (?P.*) - (?P\d\d\d\d/\d\d/\d\d - \d\d:\d\d:\d\d)\nTable (?P.+$)", re.MULTILINE) re_Button = re.compile(ur"^Seat (?P
[0-9]+)\.txt") def compilePlayerRegexs(self, hand): @@ -55,10 +56,10 @@ class Everleaf(HandHistoryConverter): self.re_Antes = re.compile(ur"^%s: posts ante \[(?:\$| €|) (?P[.0-9]+)" % player_re, re.MULTILINE) self.re_BringIn = re.compile(ur"^%s posts bring-in (?:\$| €|)(?P[.0-9]+)\." % player_re, re.MULTILINE) self.re_HeroCards = re.compile(ur"^Dealt to %s \[ (?P.*) \]" % player_re, re.MULTILINE) - self.re_Action = re.compile(ur"^%s(?P: bets| checks| raises| calls| folds)(\s\[(?:\$| €|) (?P[.\d]+) (USD|EUR|)\])?" % player_re, re.MULTILINE) + self.re_Action = re.compile(ur"^%s(?P: bets| checks| raises| calls| folds)(\s\[(?:\$| €|) (?P[.,\d]+) (USD|EURO|Chips)\])?" % player_re, re.MULTILINE) #self.re_Action = re.compile(ur"^%s(?P: bets| checks| raises| calls| folds| complete to)(\s\[?(?:\$| €|) ?(?P\d+\.?\d*)\.?\s?(USD|EUR|)\]?)?" % player_re, re.MULTILINE) self.re_ShowdownAction = re.compile(ur"^%s shows \[ (?P.*) \]" % player_re, re.MULTILINE) - self.re_CollectPot = re.compile(ur"^%s wins (?:\$| €|) (?P[.\d]+) (USD|EUR|chips)(.*?\[ (?P.*?) \])?" % player_re, re.MULTILINE) + self.re_CollectPot = re.compile(ur"^%s wins (?:\$| €|) (?P[.\d]+) (USD|EURO|chips)(.*?\[ (?P.*?) \])?" % player_re, re.MULTILINE) self.re_SitsOut = re.compile(ur"^%s sits out" % player_re, re.MULTILINE) def readSupportedGames(self): @@ -66,7 +67,9 @@ class Everleaf(HandHistoryConverter): ["ring", "hold", "pl"], ["ring", "hold", "fl"], ["ring", "studhi", "fl"], - ["ring", "omahahi", "pl"] + ["ring", "omahahi", "pl"], + ["ring", "omahahilo", "pl"], + ["tour", "hold", "nl"] ] def determineGameType(self, handText): @@ -138,6 +141,12 @@ or None if we fail to get the info """ hand.tablename = m.group('TABLE') hand.maxseats = 6 # assume 6-max unless we have proof it's a larger/smaller game, since everleaf doesn't give seat max info + t = self.re_TourneyInfoFromFilename.search(self.in_path) + if t: + tourno = t.group('TOURNO') + hand.tourNo = tourno + hand.tablename = t.group('TABLE') + # Believe Everleaf time is GMT/UTC, no transation necessary # Stars format (Nov 10 2008): 2008/11/07 12:38:49 CET [2008/11/07 7:38:49 ET] # or : 2008/11/07 12:38:49 ET @@ -287,7 +296,9 @@ or None if we fail to get the info """ @staticmethod def getTableTitleRe(type, table_name=None, tournament = None, table_number=None): - return "^%s -" % (table_name) + if tournament: + return "%s - Tournament ID: %s -" % (table_number, tournament) + return "%s -" % (table_name) diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py index 192124e5..b55c9ec1 100755 --- a/pyfpdb/GuiAutoImport.py +++ b/pyfpdb/GuiAutoImport.py @@ -193,12 +193,13 @@ class GuiAutoImport (threading.Thread): self.doAutoImportBool = True widget.set_label(u' _Stop Autoimport ') if self.pipe_to_hud is None: - if os.name == 'nt': - if sys.argv[0] == 'fpdb.exe': - command = 'HUD_main.exe' - else: - path = sys.path[0].replace('\\','\\\\') - command = 'python "'+path+'\\HUD_main.py" ' + self.settings['cl_options'] + if Configuration.FROZEN: + path = Configuration.EXEC_PATH + command = "HUD_main.exe" + bs = 0 + elif os.name == 'nt': + path = sys.path[0].replace('\\','\\\\') + command = 'python "'+path+'\\HUD_main.py" ' + self.settings['cl_options'] bs = 0 else: command = os.path.join(sys.path[0], 'HUD_main.py') @@ -206,6 +207,7 @@ class GuiAutoImport (threading.Thread): bs = 1 try: + print "opening pipe to HUD" self.pipe_to_hud = subprocess.Popen(command, bufsize=bs, stdin=subprocess.PIPE, universal_newlines=True) diff --git a/pyfpdb/HUD_main.py b/pyfpdb/HUD_main.py index 7cc72886..5a3ee2dd 100755 --- a/pyfpdb/HUD_main.py +++ b/pyfpdb/HUD_main.py @@ -277,7 +277,8 @@ class HUD_main(object): cards['common'] = comm_cards['common'] table_kwargs = dict(table_name = table_name, tournament = tour_number, table_number = tab_number) - search_string = getTableTitleRe(self.config, site, type, **table_kwargs) + search_string = getTableTitleRe(self.config, site_name, type, **table_kwargs) + # print "getTableTitleRe ", self.config, site_name, type, "=", search_string tablewindow = Tables.Table(search_string, **table_kwargs) if tablewindow is None: diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index fa1805e0..5fa28608 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -71,7 +71,7 @@ follow : whether to tail -f the input""" self.config = config #log = Configuration.get_logger("logging.conf", "parser", log_dir=self.config.dir_log) log.info("HandHistory init - %s subclass, in_path '%s'; out_path '%s'" % (self.sitename, in_path, out_path) ) - + self.index = index self.starsArchive = starsArchive @@ -84,7 +84,7 @@ follow : whether to tail -f the input""" # Tourney object used to store TourneyInfo when called to deal with a Summary file self.tourney = None - + if in_path == '-': self.in_fh = sys.stdin @@ -113,7 +113,7 @@ follow : whether to tail -f the input""" self.follow = follow self.compiledPlayers = set() self.maxseats = 10 - + self.status = True self.parsedObjectType = "HH" #default behaviour : parsing HH files, can be "Summary" if the parsing encounters a Summary File @@ -128,7 +128,7 @@ HandHistoryConverter: '%(sitename)s' in_path '%(in_path)s' out_path '%(out_path)s' follow '%(follow)s' - """ % locals() + """ % locals() def start(self): """Process a hand at a time from the input specified by in_path. @@ -148,7 +148,7 @@ Otherwise, finish at EOF. self.numHands = 0 self.numErrors = 0 if self.follow: - #TODO: See how summary files can be handled on the fly (here they should be rejected as before) + #TODO: See how summary files can be handled on the fly (here they should be rejected as before) log.info("Tailing '%s'" % self.in_path) for handText in self.tailHands(): try: @@ -183,7 +183,7 @@ Otherwise, finish at EOF. endtime = time.time() if summaryParsingStatus : log.info("Summary file '%s' correctly parsed (took %.3f seconds)" % (self.in_path, endtime - starttime)) - else : + else : log.warning("Error converting summary file '%s' (took %.3f seconds)" % (self.in_path, endtime - starttime)) except IOError, ioe: @@ -237,7 +237,7 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py. # x-- [x,--,] x,-- # x--x [x,--,x] x,x # x--x-- [x,--,x,--,] x,x,-- - + # The length is always odd. # 'odd' indices are always splitters. # 'even' indices are always paragraphs or '' @@ -271,13 +271,13 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py. log.info("Read no hands.") return [] return re.split(self.re_SplitHands, self.obs) - + def processHand(self, handText): gametype = self.determineGameType(handText) log.debug("gametype %s" % gametype) hand = None l = None - if gametype is None: + if gametype is None: gametype = "unmatched" # TODO: not ideal, just trying to not error. # TODO: Need to count failed hands. @@ -311,7 +311,7 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py. # This function should return a list of lists looking like: # return [["ring", "hold", "nl"], ["tour", "hold", "nl"]] # Showing all supported games limits and types - + def readSupportedGames(self): abstract # should return a list @@ -346,17 +346,17 @@ or None if we fail to get the info """ # Needs to return a list of lists in the format # [['seat#', 'player1name', 'stacksize'] ['seat#', 'player2name', 'stacksize'] [...]] def readPlayerStacks(self, hand): abstract - + def compilePlayerRegexs(self): abstract """Compile dynamic regexes -- these explicitly match known player names and must be updated if a new player joins""" - + # Needs to return a MatchObject with group names identifying the streets into the Hand object # so groups are called by street names 'PREFLOP', 'FLOP', 'STREET2' etc # blinds are done seperately def markStreets(self, hand): abstract #Needs to return a list in the format - # ['player1name', 'player2name', ...] where player1name is the sb and player2name is bb, + # ['player1name', 'player2name', ...] where player1name is the sb and player2name is bb, # addtional players are assumed to post a bb oop def readBlinds(self, hand): abstract def readAntes(self, hand): abstract @@ -369,16 +369,16 @@ or None if we fail to get the info """ def readShownCards(self, hand): abstract # Some sites do odd stuff that doesn't fall in to the normal HH parsing. - # e.g., FTP doesn't put mixed game info in the HH, but puts in in the + # e.g., FTP doesn't put mixed game info in the HH, but puts in in the # file name. Use readOther() to clean up those messes. def readOther(self, hand): pass - + # Some sites don't report the rake. This will be called at the end of the hand after the pot total has been calculated # an inheriting class can calculate it for the specific site if need be. def getRake(self, hand): hand.rake = hand.totalpot - hand.totalcollected # * Decimal('0.05') # probably not quite right - - + + def sanityCheck(self): """Check we aren't going to do some stupid things""" #TODO: the hhbase stuff needs to be in fpdb_import @@ -403,7 +403,7 @@ or None if we fail to get the info """ # Make sure input and output files are different or we'll overwrite the source file if True: # basically.. I don't know sane = True - + if self.in_path != '-' and self.out_path == self.in_path: print "HH Sanity Check: output and input files are the same, check config" sane = False @@ -436,7 +436,7 @@ or None if we fail to get the info """ def readFile(self): """Open in_path according to self.codepage. Exceptions caught further up""" - + if self.filetype == "text": if self.in_path == '-': # read from stdin @@ -471,7 +471,7 @@ or None if we fail to get the info """ if hand.gametype['base'] == 'stud': if mo <= 8: return 8 - else: return mo + else: return mo if hand.gametype['base'] == 'draw': if mo <= 6: return 6 @@ -507,9 +507,9 @@ or None if we fail to get the info """ def getParsedObjectType(self): return self.parsedObjectType - #returns a status (True/False) indicating wether the parsing could be done correctly or not + #returns a status (True/False) indicating wether the parsing could be done correctly or not def readSummaryInfo(self, summaryInfoList): abstract - + def getTourney(self): return self.tourney @@ -532,6 +532,3 @@ def getSiteHhc(config, sitename): hhcName = config.supported_sites[sitename].converter hhcModule = __import__(hhcName) return getattr(hhcModule, hhcName[:-6]) - - - diff --git a/pyfpdb/Options.py b/pyfpdb/Options.py index ab226124..6570dbe4 100644 --- a/pyfpdb/Options.py +++ b/pyfpdb/Options.py @@ -15,9 +15,9 @@ #In the "official" distribution you can find the license in #agpl-3.0.txt in the docs folder of the package. -import os import sys from optparse import OptionParser +# http://docs.python.org/library/optparse.html def fpdb_options(): @@ -41,6 +41,14 @@ def fpdb_options(): parser.add_option("-k", "--konverter", dest="hhc", default="PokerStarsToFpdb", help="Module name for Hand History Converter") + parser.add_option("-l", "--logging", + dest = "log_level", + choices = ('DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL', 'EMPTY'), + help = "Error logging level. (DEBUG, INFO, WARNING, ERROR, CRITICAL, EMPTY)", + default = 'EMPTY') + parser.add_option("-v", "--version", action = "store_true", + help = "Print version information and exit.") + (options, argv) = parser.parse_args() return (options, argv) diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py index c2a92881..90a8bfd0 100755 --- a/pyfpdb/PokerStarsToFpdb.py +++ b/pyfpdb/PokerStarsToFpdb.py @@ -103,7 +103,7 @@ class PokerStars(HandHistoryConverter): self.re_Action = re.compile(r""" ^%(PLYR)s:(?P\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat) (\s(%(CUR)s)?(?P[.\d]+))?(\sto\s%(CUR)s(?P[.\d]+))? # the number discarded goes in - (\scards?(\s\[(?P.+?)\])?)?""" + (\scards?(\s\[(?P.+?)\])?)?$""" % subst, re.MULTILINE|re.VERBOSE) self.re_ShowdownAction = re.compile(r"^%s: shows \[(?P.*)\]" % player_re, re.MULTILINE) self.re_CollectPot = re.compile(r"Seat (?P[0-9]+): %(PLYR)s (\(button\) |\(small blind\) |\(big blind\) |\(button\) \(small blind\) )?(collected|showed \[.*\] and won) \(%(CUR)s(?P[.\d]+)\)(, mucked| with.*|)" % subst, re.MULTILINE) diff --git a/pyfpdb/Stats.py b/pyfpdb/Stats.py index 18913eed..ab92c99f 100755 --- a/pyfpdb/Stats.py +++ b/pyfpdb/Stats.py @@ -245,8 +245,20 @@ def saw_f(stat_dict, player): def n(stat_dict, player): """ Number of hands played.""" try: + # If sample is large enough, use X.Yk notation instead + _n = stat_dict[player]['n'] + fmt = '%d' % _n + if _n >= 1000: + k = _n / 1000 + c = _n % 1000 + _c = float(c) / 100.0 + d = int(round(_c)) + if d == 10: + k += 1 + d = 0 + fmt = '%d.%dk' % (k, d) return (stat_dict[player]['n'], - '%d' % (stat_dict[player]['n']), + '%s' % fmt, 'n=%d' % (stat_dict[player]['n']), 'n=%d' % (stat_dict[player]['n']), '(%d)' % (stat_dict[player]['n']), diff --git a/pyfpdb/TableWindow.py b/pyfpdb/TableWindow.py index 10607b16..aa994bfe 100644 --- a/pyfpdb/TableWindow.py +++ b/pyfpdb/TableWindow.py @@ -11,12 +11,12 @@ of Table_Window objects representing the windows found. # 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 @@ -58,7 +58,7 @@ bad_words = ('History for table:', 'HUD:', 'Chat:') # Here are the custom signals we define for allowing the 'client watcher' # thread to communicate with the gui thread. Any time a poker client is -# is moved, resized, or closed on of these signals is emitted to the +# is moved, resized, or closed on of these signals is emitted to the # HUD main window. gobject.signal_new("client_moved", gtk.Window, gobject.SIGNAL_RUN_LAST, @@ -80,16 +80,16 @@ gobject.signal_new("client_destroyed", gtk.Window, # 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 +# 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 +# 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 +# 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 +# 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(object): @@ -101,7 +101,7 @@ class Table_Window(object): self.table = int(table_number) self.name = "%s - %s" % (self.tournament, self.table) elif table_name is not None: - search_string = table_name + # search_string = table_name self.name = table_name self.tournament = None else: @@ -111,7 +111,7 @@ class Table_Window(object): def __str__(self): # __str__ method for testing - likely_attrs = ("site", "number", "title", "width", "height", "x", "y", + likely_attrs = ("site", "number", "title", "width", "height", "x", "y", "tournament", "table", "gdkhandle") temp = 'TableWindow object\n' for a in likely_attrs: @@ -125,7 +125,7 @@ class Table_Window(object): for game, names in game_names.iteritems(): for name in names: if name in title: - return game + return game return None def check_geometry(self): diff --git a/pyfpdb/WinTables.py b/pyfpdb/WinTables.py index 89d6e1e2..42bb8b41 100644 --- a/pyfpdb/WinTables.py +++ b/pyfpdb/WinTables.py @@ -54,10 +54,13 @@ class Table(Table_Window): titles = {} win32gui.EnumWindows(win_enum_handler, titles) for hwnd in titles: + if titles[hwnd] == "": continue + # print "searching ", search_string, " in ", titles[hwnd] if re.search(search_string, titles[hwnd]): 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 'FPDBHUD' in titles[hwnd]: continue # can't attach to ourselves! self.window = hwnd break diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py index 340d12b9..43121804 100755 --- a/pyfpdb/fpdb.py +++ b/pyfpdb/fpdb.py @@ -796,8 +796,11 @@ class fpdb: # TODO: can we get some / all of the stuff done in this function to execute on any kind of abort? print "Quitting normally" # TODO: check if current settings differ from profile, if so offer to save or abort - if self.db is not None and self.db.connected: - self.db.disconnect() + try: + if self.db is not None and self.db.connected: + self.db.disconnect() + except _mysql_exceptions.OperationalError: # oh, damn, we're already disconnected + pass self.statusIcon.set_visible(False) gtk.main_quit() diff --git a/pyfpdb/py2exe_setup.py b/pyfpdb/py2exe_setup.py index 2e9c894d..32d6d19b 100644 --- a/pyfpdb/py2exe_setup.py +++ b/pyfpdb/py2exe_setup.py @@ -129,7 +129,7 @@ setup( description = 'Free Poker DataBase', version = '0.12', - console = [ {'script': 'fpdb.py', }, + console = [ {'script': 'fpdb.py', "icon_resources": [(1, "../gfx/fpdb_large_icon.ico")]}, {'script': 'HUD_main.py', }, {'script': 'Configuration.py', } ], diff --git a/pyfpdb/test2.py b/pyfpdb/test2.py index 74ce1e72..7dea96f6 100755 --- a/pyfpdb/test2.py +++ b/pyfpdb/test2.py @@ -22,12 +22,39 @@ Test if gtk is working. ######################################################################## import sys +import os +import Configuration + +config_path = Configuration.get_default_config_path() try: + import gobject as _gobject + print "Import of gobject:\tSuccess" import pygtk + print "Import of pygtk:\tSuccess" pygtk.require('2.0') import gtk + print "Import of gtk:\t\tSuccess" + import pango + print "Import of pango:\tSuccess" + if os.name == 'nt': + import win32 + import win32api + print "Import of win32:\tSuccess" + + try: + import matplotlib + matplotlib.use('GTK') + print "Import of matplotlib:\tSuccess" + import numpy + print "Import of numpy:\tSuccess" + import pylab + print "Import of pylab:\tSuccess" + except: + print "\nError:", sys.exc_info() + print "\npress return to finish" + sys.stdin.readline() win = gtk.Window(gtk.WINDOW_TOPLEVEL) win.set_title("Test GTK") @@ -42,7 +69,7 @@ try: (gtk.STOCK_CLOSE, gtk.RESPONSE_OK)) dia.set_default_size(500, 300) - l = gtk.Label("GTK is working!") + l = gtk.Label("GTK is working!\nConfig location: %s" %config_path) dia.vbox.add(l) l.show() diff --git a/pyfpdb/test_PokerStars.py b/pyfpdb/test_PokerStars.py index 4244f532..588368ab 100755 --- a/pyfpdb/test_PokerStars.py +++ b/pyfpdb/test_PokerStars.py @@ -27,9 +27,9 @@ settings.update(config.get_default_paths()) gametype = {'type':'ring', 'base':'draw', 'category':'badugi', 'limitType':'fl', 'sb':'0.25', 'bb':'0.50','currency':'USD'} text = "" -hhc = PokerStarsToFpdb.PokerStars(autostart=False) +hhc = PokerStarsToFpdb.PokerStars(config, autostart=False) -h = HoldemOmahaHand(None, "PokerStars", gametype, text, builtFrom = "Test") +h = HoldemOmahaHand(config, None, "PokerStars", gametype, text, builtFrom = "Test") h.addPlayer("1", "s0rrow", "100000") hhc.compilePlayerRegexs(h) @@ -39,7 +39,7 @@ def checkGameInfo(hhc, header, info): assert hhc.determineGameType(header) == info def testGameInfo(): - hhc = PokerStarsToFpdb.PokerStars(autostart=False) + hhc = PokerStarsToFpdb.PokerStars(config, autostart=False) pairs = ( (u"PokerStars Game #20461877044: Hold'em No Limit ($1/$2) - 2008/09/16 18:58:01 ET", {'type':'ring', 'base':"hold", 'category':'holdem', 'limitType':'nl', 'sb':'1', 'bb':'2', 'currency':'USD'}),