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

Conflicts:
	pyfpdb/fpdb_import.py

pyfpdb/Hand.py

@@ -102,10 +102,6 @@ If a player has None chips he won't be added."""
         else:
             logging.error("markstreets didn't match")
 
-#def addHoleCards -- to Holdem subclass
-
-
-
     def checkPlayerExists(self,player):
         if player not in [p[1] for p in self.players]:
             print "checkPlayerExists", player, "fail"

pyfpdb/HandHistoryConverter.py

@@ -90,7 +90,7 @@ class HandHistoryConverter(threading.Thread):
         else:
             # TODO: out_path should be sanity checked before opening. Perhaps in fpdb_import?
             # I'm not sure what we're looking for, although we don't want out_path==in_path!='-'
-            self.out_fh = open(self.out_path, 'a') #TODO: append may be overly conservative.
+            self.out_fh = open(self.out_path, 'w') # doomswitch is now on :|
         self.sitename  = sitename
         self.follow = follow
         self.compiledPlayers   = set()

pyfpdb/fpdb_import.py

@@ -252,9 +252,8 @@ class Importer:
             supp = conv.readSupportedGames() # Should this be done by HHC on init?
             #gt = conv.determineGameType()
             # TODO: Check that gt is in supp - error appropriately if not
-#            conv.processFile()
             if(conv.getStatus()):
-                (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(conv.getProcessedFile(), site)
+                (stored, duplicates, partial, errors, ttime) = self.import_fpdb_file(out_path, site)
             else:
                 # conversion didn't work
                 # TODO: appropriate response?