From 0f4b5827d0d0cbe716347a148dabf10b2ede08e4 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Sat, 20 Nov 2010 03:29:53 -0500
Subject: [PATCH 1/2] re-undo the last merge change i made oops

---
 pyfpdb/CarbonToFpdb.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/CarbonToFpdb.py b/pyfpdb/CarbonToFpdb.py
index 1a1541ee..cf8794da 100644
--- a/pyfpdb/CarbonToFpdb.py
+++ b/pyfpdb/CarbonToFpdb.py
@@ -66,7 +66,7 @@ class Carbon(HandHistoryConverter):
     # Static regexes
     re_SplitHands = re.compile(r'</game>\n+(?=<game)')
     re_TailSplitHands = re.compile(r'(</game>)')
-    re_GameInfo = re.compile(r'<description type="(?P<GAME>[a-zA-Z ]+)" stakes="(?P<LIMIT>[a-zA-Z ]+) ?\(\$(?P<SB>[.0-9]+)/\$(?P<BB>[.0-9]+)?\)"/>', re.MULTILINE)
+    re_GameInfo = re.compile(r'<description type="(?P<GAME>[a-zA-Z ]+)" stakes="(?P<LIMIT>[a-zA-Z ]+) \(\$(?P<SB>[.0-9]+)/\$(?P<BB>[.0-9]+)\)"/>', re.MULTILINE)
     re_HandInfo = re.compile(r'<game id="(?P<HID1>[0-9]+)-(?P<HID2>[0-9]+)" starttime="(?P<DATETIME>[0-9]+)" numholecards="2" gametype="2" realmoney="true" data="[0-9]+\|(?P<TABLE>[^\(]+)', re.MULTILINE)
     re_Button = re.compile(r'<players dealer="(?P<BUTTON>[0-9]+)">')
     re_PlayerInfo = re.compile(r'<player seat="(?P<SEAT>[0-9]+)" nickname="(?P<PNAME>.+)" balance="\$(?P<CASH>[.0-9]+)" dealtin="(?P<DEALTIN>(true|false))" />', re.MULTILINE)

From 7c4d08833bc95a51317dd1224ea644980792ba82 Mon Sep 17 00:00:00 2001
From: Eric Blade <blade.eric@gmail.com>
Date: Fri, 26 Nov 2010 16:57:47 -0500
Subject: [PATCH 2/2] add strptime to Database

---
 pyfpdb/Database.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py
index 65e7a87d..29637c96 100644
--- a/pyfpdb/Database.py
+++ b/pyfpdb/Database.py
@@ -37,7 +37,7 @@ import os
 import sys
 import traceback
 from datetime import datetime, date, time, timedelta
-from time import time, strftime, sleep
+from time import time, strftime, sleep, strptime
 from decimal import Decimal
 import string
 import re