Merge branch 'carl'

Conflicts: packaging/debian/changelog pyfpdb/PokerStarsToFpdb.py pyfpdb/TourneySummary.py
2010-07-08 22:33:09 +02:00
parent f0b3dcb7a8 e7776de8f1
commit 3bff176970
24 changed files with 211 additions and 60 deletions
@@ -201,7 +201,7 @@ class Fulltilt(HandHistoryConverter):
            return None
        hand.handid = m.group('HID')
        hand.tablename = m.group('TABLE')
-        hand.starttime = datetime.datetime.strptime(m.group('DATETIME'), "%H:%M:%S ET - %Y/%m/%d")
+        hand.startTime = datetime.datetime.strptime(m.group('DATETIME'), "%H:%M:%S ET - %Y/%m/%d")

        if m.group("CANCELLED") or m.group("PARTIAL"):
            raise FpdbParseError(hid=m.group('HID'))