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

pyfpdb/Hand.py

@@ -79,13 +79,13 @@ class Hand(object):
         self.fee = None  # the Database code is looking for this one .. ?
         self.level = None
         self.mixed = None
-        self.speed = "Normal"
-        self.isRebuy = False
-        self.isAddOn = False
-        self.isKO = False
+        self.speed = None
+        self.isRebuy = None
+        self.isAddOn = None
+        self.isKO = None
         self.koBounty = None
-        self.isMatrix = False
-        self.isShootout = False
+        self.isMatrix = None
+        self.isShootout = None
         self.added = None
         self.addedCurrency = None
         self.tourneyComment = None

pyfpdb/PokerStarsToFpdb.py

@@ -262,6 +262,8 @@ class PokerStars(HandHistoryConverter):
                                 info['BOUNTY'] = info['BOUNTY'].strip(u'$€') # Strip here where it isn't 'None'
                                 hand.koBounty = int(100*Decimal(info['BOUNTY']))
                                 hand.isKO = True
+                            else:
+                                hand.isKO = False
 
                             info['BIRAKE'] = info['BIRAKE'].strip(u'$€')