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

Conflicts:
	pyfpdb/fpdb_simple.py

pyfpdb/fpdb_simple.py

@@ -771,7 +771,7 @@ def parseCardLine(site, category, street, line, names, cardValues, cardSuits, bo
                     print "line:",line,"cardValues[playerNo]:",cardValues[playerNo]
                     raise FpdbError("read too many/too few holecards in parseCardLine")
         elif (category=="razz" or category=="studhi" or category=="studhilo"):
-            if (line.find("shows")==-1):
+            if (line.find("shows")==-1 and line.find("mucked")==-1):
                 #print "parseCardLine(in stud if), street:", street
                 if line[pos+2]=="]": #-> not (hero and 3rd street)
                     cardValues[playerNo][street+2]=line[pos:pos+1]
@@ -1005,7 +1005,15 @@ def parseTableLine(site, base, line):
         elif line.find("heads up")!=-1:
             maxSeats=2
             
-        return {'maxSeats':maxSeats, 'tableName':line[pos1:pos2]}
+        tableName = line[pos1:pos2]
+        for pattern in [' \(6 max\)', ' \(heads up\)', ' \(deep\)',
+                    ' \(deep hu\)', ' \(deep 6\)', ' \(2\)',
+                    ' \(edu\)', ' \(edu, 6 max\)', ' \(6\)',
+                    ' \(speed\)', 
+                    ' no all-in', ' fast', ',', ' 50BB min', '\s+$']:
+            tableName = re.sub(pattern, '', tableName)
+        tableName = tableName.rstrip()            
+        return {'maxSeats':maxSeats, 'tableName':tableName}
     else:
         raise FpdbError("invalid site ID")
 #end def parseTableLine