Merge branch 'master' of git://git.assembla.com/fpdboz.git
This commit is contained in:
		
						commit
						4341222994
					
				|  | @ -128,9 +128,11 @@ follow :  whether to tail -f the input""" | |||
|         logging.debug("readHandInfo: %s" % info) | ||||
|         for key in info: | ||||
|             if key == 'DATETIME': | ||||
|                 datetime = info[key].replace(" - "," ") # some are like "2009/02/26 - 15:22:55 ET" | ||||
|                 datetime = datetime.replace(" (ET)","") # kludge for now. | ||||
|                 datetime = datetime.replace(" ET","") # kludge for now. | ||||
|                 #2008/11/12 10:00:48 CET [2008/11/12 4:00:48 ET] | ||||
|                 #2008/08/17 - 01:14:43 (ET) | ||||
|                 #2008/09/07 06:23:14 ET | ||||
|                 m2 = re.search("(?P<Y>[0-9]{4})\/(?P<M>[0-9]{2})\/(?P<D>[0-9]{2})[\- ]+(?P<H>[0-9]+):(?P<MIN>[0-9]+):(?P<S>[0-9]+)", info[key]) | ||||
|                 datetime = "%s/%s/%s %s:%s:%s" % (m2.group('Y'), m2.group('M'),m2.group('D'),m2.group('H'),m2.group('MIN'),m2.group('S')) | ||||
|                 hand.starttime = time.strptime(datetime, "%Y/%m/%d %H:%M:%S") | ||||
|             if key == 'HID': | ||||
|                 hand.handid = info[key] | ||||
|  |  | |||
|  | @ -35,6 +35,9 @@ def testGameInfo(): | |||
|     (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'}), | ||||
| 
 | ||||
|     (u"PokerStars Game #22073591924:  Hold'em No Limit ($0.50/$1.00) - 2008/11/16 1:22:21 CET [2008/11/15 19:22:21 ET]", | ||||
|     {'type':'ring', 'base':'hold', 'category':'holdem', 'limitType':'nl', 'sb':'0.50', 'bb':'1.00','currency':'USD'}), | ||||
| 
 | ||||
|     (u"PokerStars Game #25974627364:  Omaha Pot Limit ($0.05/$0.10) - 2009/03/15 0:29:00 ET", | ||||
|     {'type':'ring', 'base':'hold', 'category':'omahahi', 'limitType':'pl', 'sb':'0.05', 'bb':'0.10','currency':'USD'}) | ||||
|     ) | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user