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

pyfpdb/fpdb.py

@@ -331,6 +331,7 @@ class fpdb:
 		#print "start of tab_main_help"
 		mh_tab=gtk.Label("""Welcome to Fpdb!
 For documentation please visit our website at http://fpdb.sourceforge.net/ or check the docs directory in the fpdb folder.
+Please note that default.conf is no longer needed nor used, all configuration now happens in HUD_config.xml
 This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
 		self.add_and_display_tab(mh_tab, "Help")
 	#end def tab_main_help
@@ -362,7 +363,7 @@ This program is licensed under the AGPL3, see docs"""+os.sep+"agpl-3.0.txt")
 		self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
 		self.window.connect("delete_event", self.delete_event)
 		self.window.connect("destroy", self.destroy)
-		self.window.set_title("Free Poker DB - version: alpha8+, p137 or higher")
+		self.window.set_title("Free Poker DB - version: alpha9+, p143 or higher")
 		self.window.set_border_width(1)
 		self.window.set_size_request(1020,400)
 		self.window.set_resizable(True)

pyfpdb/fpdb_import.py

@@ -174,8 +174,8 @@ class Importer:
 
 		if firstline.find("Tournament Summary")!=-1:
 			print "TODO: implement importing tournament summaries"
-			self.faobs = readfile(inputFile)
-			self.parseTourneyHistory()
+			#self.faobs = readfile(inputFile)
+			#self.parseTourneyHistory()
 			return 0
 		
 		site=fpdb_simple.recogniseSite(firstline)

pyfpdb/fpdb_simple.py

@@ -830,13 +830,11 @@ def parseHandStartTime(topline, site):
 			pos2 = topline.find("UTC")
 			tmp=topline[pos1:pos2]
 			isUTC=True
-			print "UTC tmp:",tmp
 		else:
 			tmp=topline[-30:]
 			#print "parsehandStartTime, tmp:", tmp
 			pos = tmp.find("-")+2
 			tmp = tmp[pos:]
-			print "ET tmp:",tmp
 		#Need to match either
 		# 2008/09/07 06:23:14 ET or
 		# 2008/08/17 - 01:14:43 (ET)
@@ -849,7 +847,6 @@ def parseHandStartTime(topline, site):
 	if (site=="ftp" or site=="ps") and not isUTC: #these use US ET
 		result+=datetime.timedelta(hours=5)
 	
-	print "parseHandStartTime result:",result
 	return result
 #end def parseHandStartTime