Merge branch 'master' of git://github.com/grindi/fpdb-grindi

Conflicts:
	pyfpdb/HandHistoryConverter.py

pyfpdb/FulltiltToFpdb.py

@@ -150,7 +150,7 @@ class Fulltilt(HandHistoryConverter):
         self.obs = self.obs.replace('\r\n', '\n')
         if self.obs == "" or self.obs == None:
             logging.info("Read no hands.")
-            return
+            return []
         return re.split(self.re_SplitHands,  self.obs)
 
     def readHandInfo(self, hand):

pyfpdb/HandHistoryConverter.py

@@ -215,7 +215,7 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
         self.obs = self.obs.replace('\r\n', '\n')
         if self.obs == "" or self.obs == None:
             log.info("Read no hands.")
-            return
+            return []
         return re.split(self.re_SplitHands,  self.obs)
         
     def processHand(self, handText):

pyfpdb/PartyPokerToFpdb.py

@@ -442,7 +442,7 @@ class PartyPoker(HandHistoryConverter):
 
             if actionType == 'raises':
                 if street == 'PREFLOP' and \
-                    playerName in [item[0] for item in hand.actions['BLINDSANTES']]:
+                    playerName in [item[0] for item in hand.actions['BLINDSANTES'] if item[2]!='ante']:
                     # preflop raise from blind
                     hand.addRaiseBy( street, playerName, amount )
                 else: