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

pyfpdb/DerivedStats.py

@@ -292,7 +292,7 @@ class DerivedStats():
         
         # hand.players includes people that are sitting out on some sites.
         # Those that posted an ante should have been deal cards.
-        p_in = set([x[0] for x in hand.actions['BLINDSANTES']] + [x[0] for x in hand.actions['PREFLOP']])
+        p_in = set([x[0] for x in hand.actions[hand.allStreets[0]]] + [x[0] for x in hand.actions[hand.actionStreets[0]]])
 
         for (i, street) in enumerate(hand.actionStreets):
             actions = hand.actions[street]

pyfpdb/FulltiltToFpdb.py

@@ -711,5 +711,3 @@ if __name__ == "__main__":
 
     e = Fulltilt(in_path = options.ipath, out_path = options.opath, follow = options.follow)
 
-
-

pyfpdb/fpdb.pyw

@@ -101,7 +101,7 @@ except:
 
 import GuiPrefs
 import GuiLogView
-import GuiDatabase
+#import GuiDatabase
 import GuiBulkImport
 import ImapFetcher
 import GuiRingPlayerStats