From 3bd8f3d3520520ec9aee2fde175be9942fca8271 Mon Sep 17 00:00:00 2001 From: Worros Date: Sun, 5 Sep 2010 00:55:55 +0800 Subject: [PATCH] PSSummary: *mutters abaout \r\n* --- pyfpdb/PokerStarsSummary.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pyfpdb/PokerStarsSummary.py b/pyfpdb/PokerStarsSummary.py index dc6d8292..0066d0de 100644 --- a/pyfpdb/PokerStarsSummary.py +++ b/pyfpdb/PokerStarsSummary.py @@ -64,12 +64,12 @@ class PokerStarsSummary(TourneySummary): re_TourneyInfo = re.compile(u""" \#(?P[0-9]+),\s (?PNo\sLimit|Limit|LIMIT|Pot\sLimit)\s - (?PHold\'em|Razz|RAZZ|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s - (?P[ a-zA-Z]+\s)? - (Buy-In:\s\$(?P[.0-9]+)(\/\$(?P[.0-9]+))?\s)? - (?P[0-9]+)\splayers\s - (\$?(?P[.\d]+)\sadded\sto\sthe\sprize\spool\sby\sPokerStars\.com\s)? - (Total\sPrize\sPool:\s\$?(?P[.0-9]+)\s)? + (?PHold\'em|Razz|RAZZ|7\sCard\sStud|7\sCard\sStud\sHi/Lo|Omaha|Omaha\sHi/Lo|Badugi|Triple\sDraw\s2\-7\sLowball|5\sCard\sDraw)\s+ + (?P[ a-zA-Z]+\s+)? + (Buy-In:\s\$(?P[.0-9]+)(\/\$(?P[.0-9]+))?\s+)? + (?P[0-9]+)\splayers\s+ + (\$?(?P[.\d]+)\sadded\sto\sthe\sprize\spool\sby\sPokerStars\.com\s+)? + (Total\sPrize\sPool:\s\$?(?P[.0-9]+)\s+)? (Target\sTournament\s.*)? Tournament\sstarted\s-\s (?P[0-9]{4})\/(?P[0-9]{2})\/(?P[0-9]{2})[\-\s]+(?P[0-9]+):(?P[0-9]+):(?P[0-9]+)\s?\(?(?P[A-Z]+)\)\s @@ -77,7 +77,7 @@ class PokerStarsSummary(TourneySummary): re_Currency = re.compile(u"""(?P[%(LS)s]|FPP)""" % substitutions) - re_Player = re.compile(u"""(?P[0-9]+):\s(?P.*)\s\(.*\),(\s)(\$(?P[0-9]+\.[0-9]+))?(?Pstill\splaying)?((?PTournament\sTicket)\s\(WSOP\sStep\s(?P\d)\))?""") + re_Player = re.compile(u"""(?P[0-9]+):\s(?P.*)\s\(.*\),(\s)(\$(?P[0-9]+\.[0-9]+))?(?Pstill\splaying)?((?PTournament\sTicket)\s\(WSOP\sStep\s(?P\d)\))?\s+?""") re_DateTime = re.compile("\[(?P[0-9]{4})\/(?P[0-9]{2})\/(?P[0-9]{2})[\- ]+(?P[0-9]+):(?P[0-9]+):(?P[0-9]+)")