evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eric Blade 2010-09-18 02:36:17 -04:00
commit 232903bfe8
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pyfpdb/BetfairToFpdb.py
View File

@ -115,7 +115,7 @@ class Betfair(HandHistoryConverter):
m = self.re_HandInfo.search(hand.handText) m = self.re_HandInfo.search(hand.handText)
if(m == None): if(m == None):
log.error(_("Didn't match re_HandInfo")) log.error(_("Didn't match re_HandInfo"))
raise FpdbParseError("No match in readHandInfo.") raise FpdbParseError(_("No match in readHandInfo."))
print "DEBUG: got this far!" print "DEBUG: got this far!"
logging.debug("HID %s, Table %s" % (m.group('HID'), m.group('TABLE'))) logging.debug("HID %s, Table %s" % (m.group('HID'), m.group('TABLE')))
hand.handid = m.group('HID') hand.handid = m.group('HID')

2
pyfpdb/CarbonToFpdb.py
View File

@ -170,7 +170,7 @@ or None if we fail to get the info """
if m is None: if m is None:
logging.info(_("Didn't match re_HandInfo")) logging.info(_("Didn't match re_HandInfo"))
logging.info(hand.handText) logging.info(hand.handText)
raise FpdbParseError("No match in readHandInfo.") raise FpdbParseError(_("No match in readHandInfo."))
logging.debug("HID %s-%s, Table %s" % (m.group('HID1'), logging.debug("HID %s-%s, Table %s" % (m.group('HID1'),
m.group('HID2'), m.group('TABLE')[:-1])) m.group('HID2'), m.group('TABLE')[:-1]))
hand.handid = m.group('HID1') + m.group('HID2') hand.handid = m.group('HID1') + m.group('HID2')

2
pyfpdb/FulltiltToFpdb.py
View File

@ -223,7 +223,7 @@ class Fulltilt(HandHistoryConverter):
if m is None: if m is None:
logging.info(_("Didn't match re_HandInfo")) logging.info(_("Didn't match re_HandInfo"))
logging.info(hand.handText) logging.info(hand.handText)
raise FpdbParseError("No match in readHandInfo.") raise FpdbParseError(_("No match in readHandInfo."))
hand.handid = m.group('HID') hand.handid = m.group('HID')
hand.tablename = m.group('TABLE') hand.tablename = m.group('TABLE')

8
pyfpdb/ImapFetcher.py
View File

@ -45,21 +45,21 @@ else:
except IOError: except IOError:
def _(string): return string def _(string): return string
def splitPokerStarsSummaries(summaryText): def splitPokerStarsSummaries(summaryText): #TODO: this needs to go to PSS.py
re_SplitTourneys = PokerStarsSummary.PokerStarsSummary.re_SplitTourneys re_SplitTourneys = PokerStarsSummary.PokerStarsSummary.re_SplitTourneys
splitSummaries = re.split(re_SplitTourneys, summaryText) splitSummaries = re.split(re_SplitTourneys, summaryText)
if len(splitSummaries) <= 1: if len(splitSummaries) <= 1:
print _("DEBUG: re_SplitTourneyss isn't matching") print _("DEBUG: re_SplitTourneys isn't matching")
return splitSummaries return splitSummaries
def splitFullTiltSummaries(summaryText): def splitFullTiltSummaries(summaryText):#TODO: this needs to go to FTPS.py
re_SplitTourneys = FullTiltPokerSummary.FullTiltPokerSummary.re_SplitTourneys re_SplitTourneys = FullTiltPokerSummary.FullTiltPokerSummary.re_SplitTourneys
splitSummaries = re.split(re_SplitTourneys, summaryText) splitSummaries = re.split(re_SplitTourneys, summaryText)
if len(splitSummaries) <= 1: if len(splitSummaries) <= 1:
print _("DEBUG: re_SplitTourneyss isn't matching") print _("DEBUG: re_SplitTourneys isn't matching")
return splitSummaries return splitSummaries

2
pyfpdb/PokerStarsToFpdb.py
View File

@ -222,7 +222,7 @@ class PokerStars(HandHistoryConverter):
m2 = self.re_GameInfo.search(hand.handText) m2 = self.re_GameInfo.search(hand.handText)
if m is None or m2 is None: if m is None or m2 is None:
log.error("Didn't match re_HandInfo") log.error("Didn't match re_HandInfo")
raise FpdbParseError("No match in readHandInfo.") raise FpdbParseError(_("No match in readHandInfo."))
info.update(m.groupdict()) info.update(m.groupdict())
info.update(m2.groupdict()) info.update(m2.groupdict())