From b41e385979863a687f3eaff6acec303207ec64d2 Mon Sep 17 00:00:00 2001 From: steffen123 Date: Mon, 23 Aug 2010 02:16:44 +0200 Subject: [PATCH 1/5] improve error reporting in Hand.checkPlayerExists --- pyfpdb/Hand.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index c32f9f37..aa048ae4 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -320,10 +320,8 @@ If a player has None chips he won't be added.""" def checkPlayerExists(self,player): if player not in [p[1] for p in self.players]: - print _("DEBUG: checkPlayerExists %s fail") % player - raise FpdbParseError(_("checkPlayerExists: '%s' failed.") % player) - - + print (_("DEBUG: checkPlayerExists %s fail on hand number %s") % (player, self.handid)) + raise FpdbParseError(_("checkPlayerExists: '%s fail on hand number %s") % (player, self.handid)) def setCommunityCards(self, street, cards): log.debug("setCommunityCards %s %s" %(street, cards)) From 0cc5865ba1e9f22565115460e0e5cd4a8b4e918f Mon Sep 17 00:00:00 2001 From: steffen123 Date: Mon, 23 Aug 2010 03:56:07 +0200 Subject: [PATCH 2/5] config: expand general section as discussed on ML, add defaults for it --- pyfpdb/Configuration.py | 16 ++++++++++++++++ pyfpdb/HUD_config.xml.example | 7 +++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index b5afcf5a..980fc8e5 100755 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -519,6 +519,20 @@ class General(dict): for (name, value) in node.attributes.items(): log.debug(_("config.general: adding %s = %s") % (name,value)) self[name] = value + + try: + self["version"]=int(self["version"]) + except KeyError: + self["version"]=0 + self["ui_language"]="system" + self["config_difficuly"]="expert" + + def get_defaults(self): + self["version"]=0 + self["ui_language"]="system" + self["config_difficuly"]="expert" + self["config_wrap_len"]="-1" + self["day_start"]="5" def __str__(self): s = "" @@ -703,6 +717,8 @@ class Config: self.emails = {} self.gui_cash_stats = GUICashStats() + if doc.getElementsByTagName("general") == []: + self.general.get_defaults() for gen_node in doc.getElementsByTagName("general"): self.general.add_elements(node=gen_node) # add/overwrite elements in self.general diff --git a/pyfpdb/HUD_config.xml.example b/pyfpdb/HUD_config.xml.example index c2a47419..977b6060 100644 --- a/pyfpdb/HUD_config.xml.example +++ b/pyfpdb/HUD_config.xml.example @@ -5,8 +5,11 @@ - From 994fea2e224ff0d05ef7d55e23413eab4e75d614 Mon Sep 17 00:00:00 2001 From: steffen123 Date: Mon, 23 Aug 2010 05:21:07 +0200 Subject: [PATCH 3/5] move localisation scripts into locale folder --- pyfpdb/{ => locale}/create-mo-files.sh | 2 ++ pyfpdb/{ => locale}/create-po-file.sh | 1 + 2 files changed, 3 insertions(+) rename pyfpdb/{ => locale}/create-mo-files.sh (94%) rename pyfpdb/{ => locale}/create-po-file.sh (95%) diff --git a/pyfpdb/create-mo-files.sh b/pyfpdb/locale/create-mo-files.sh similarity index 94% rename from pyfpdb/create-mo-files.sh rename to pyfpdb/locale/create-mo-files.sh index 2e76648b..4b9d1dc9 100755 --- a/pyfpdb/create-mo-files.sh +++ b/pyfpdb/locale/create-mo-files.sh @@ -1 +1,3 @@ +cd .. python /usr/share/doc/python-2.7/examples/Tools/i18n/msgfmt.py --output-file=locale/hu/LC_MESSAGES/fpdb.mo locale/fpdb-hu_HU.po + diff --git a/pyfpdb/create-po-file.sh b/pyfpdb/locale/create-po-file.sh similarity index 95% rename from pyfpdb/create-po-file.sh rename to pyfpdb/locale/create-po-file.sh index c2cdfefe..d26c853a 100755 --- a/pyfpdb/create-po-file.sh +++ b/pyfpdb/locale/create-po-file.sh @@ -1,2 +1,3 @@ +cd .. python /usr/share/doc/python-2.7/examples/Tools/i18n/pygettext.py --output-dir=locale --default-domain=fpdb --output=fpdb-en_GB.po *.py* From 4170e33b35cd741e1cfdf3335b8f123d81010d3d Mon Sep 17 00:00:00 2001 From: steffen123 Date: Mon, 23 Aug 2010 05:28:45 +0200 Subject: [PATCH 4/5] update PO file --- pyfpdb/locale/fpdb-en_GB.po | 611 ++++++++++++++++++++---------------- 1 file changed, 334 insertions(+), 277 deletions(-) diff --git a/pyfpdb/locale/fpdb-en_GB.po b/pyfpdb/locale/fpdb-en_GB.po index 3a0103e8..b5023daf 100644 --- a/pyfpdb/locale/fpdb-en_GB.po +++ b/pyfpdb/locale/fpdb-en_GB.po @@ -5,12 +5,12 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-08-17 20:08+CEST\n" +"POT-Creation-Date: 2010-08-23 05:27+CEST\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" "Generated-By: pygettext.py 1.5\n" @@ -23,31 +23,31 @@ msgstr "" msgid "Output being written to" msgstr "" -#: BetfairToFpdb.py:83 +#: BetfairToFpdb.py:84 msgid "GameInfo regex did not match" msgstr "" -#: BetfairToFpdb.py:114 +#: BetfairToFpdb.py:115 msgid "Didn't match re_HandInfo" msgstr "" -#: BetfairToFpdb.py:170 +#: BetfairToFpdb.py:171 msgid "No bringin found" msgstr "" -#: BetfairToFpdb.py:206 PokerStarsToFpdb.py:440 +#: BetfairToFpdb.py:207 OnGameToFpdb.py:328 PokerStarsToFpdb.py:440 msgid "DEBUG: unimplemented readAction: '%s' '%s'" msgstr "" -#: BetfairToFpdb.py:229 PartyPokerToFpdb.py:522 PokerStarsToFpdb.py:467 +#: BetfairToFpdb.py:230 PartyPokerToFpdb.py:522 PokerStarsToFpdb.py:467 msgid "parse input hand history" msgstr "" -#: BetfairToFpdb.py:230 PartyPokerToFpdb.py:523 PokerStarsToFpdb.py:468 +#: BetfairToFpdb.py:231 PartyPokerToFpdb.py:523 PokerStarsToFpdb.py:468 msgid "output translation to" msgstr "" -#: BetfairToFpdb.py:231 PartyPokerToFpdb.py:524 PokerStarsToFpdb.py:469 +#: BetfairToFpdb.py:232 PartyPokerToFpdb.py:524 PokerStarsToFpdb.py:469 msgid "follow (tail -f) the input" msgstr "" @@ -65,71 +65,95 @@ msgid "" "Could not encode: \"%s\"\n" msgstr "" -#: Configuration.py:110 +#: Configuration.py:113 Configuration.py:126 +msgid "" +"Config file has been created at %s.\n" +msgstr "" + +#: Configuration.py:125 msgid "" "No %s found\n" " in %s\n" " or %s\n" msgstr "" -#: Configuration.py:111 -msgid "" -"Config file has been created at %s.\n" -msgstr "" - -#: Configuration.py:116 Configuration.py:117 +#: Configuration.py:131 Configuration.py:132 msgid "" "Error copying .example file, cannot fall back. Exiting.\n" msgstr "" -#: Configuration.py:121 Configuration.py:122 +#: Configuration.py:136 Configuration.py:137 msgid "" "No %s found, cannot fall back. Exiting.\n" msgstr "" -#: Configuration.py:152 +#: Configuration.py:167 msgid "Default logger initialised for " msgstr "" -#: Configuration.py:153 +#: Configuration.py:168 msgid "Default logger intialised for " msgstr "" -#: Configuration.py:164 Database.py:431 Database.py:432 +#: Configuration.py:179 Database.py:438 Database.py:439 msgid "Creating directory: '%s'" msgstr "" -#: Configuration.py:190 +#: Configuration.py:205 msgid "Default encoding set to US-ASCII, defaulting to CP1252 instead -- If you're not on a Mac, please report this problem." msgstr "" -#: Configuration.py:273 +#: Configuration.py:303 msgid "Loading site" msgstr "" -#: Configuration.py:511 +#: Configuration.py:520 msgid "config.general: adding %s = %s" msgstr "" -#: Configuration.py:544 Configuration.py:545 +#: Configuration.py:567 Configuration.py:568 msgid "bad number in xalignment was ignored" msgstr "" -#: Configuration.py:598 Configuration.py:599 +#: Configuration.py:616 +msgid "missing config section raw_hands" +msgstr "" + +#: Configuration.py:622 +msgid "Invalid config value for raw_hands.save, defaulting to \"error\"" +msgstr "" + +#: Configuration.py:629 +msgid "Invalid config value for raw_hands.compression, defaulting to \"none\"" +msgstr "" + +#: Configuration.py:642 +msgid "missing config section raw_tourneys" +msgstr "" + +#: Configuration.py:648 +msgid "Invalid config value for raw_tourneys.save, defaulting to \"error\"" +msgstr "" + +#: Configuration.py:655 +msgid "Invalid config value for raw_tourneys.compression, defaulting to \"none\"" +msgstr "" + +#: Configuration.py:673 Configuration.py:674 msgid "Configuration file %s not found. Using defaults." msgstr "" -#: Configuration.py:615 +#: Configuration.py:690 msgid "Reading configuration file %s" msgstr "" -#: Configuration.py:616 +#: Configuration.py:691 msgid "" "\n" "Reading configuration file %s\n" msgstr "" -#: Configuration.py:621 +#: Configuration.py:696 msgid "Error parsing %s. See error log file." msgstr "" @@ -141,295 +165,291 @@ msgstr "" msgid "Not using numpy to define variance in sqlite." msgstr "" -#: Database.py:246 +#: Database.py:250 msgid "Creating Database instance, sql = %s" msgstr "" -#: Database.py:382 +#: Database.py:389 msgid "*** WARNING UNKNOWN MYSQL ERROR:" msgstr "" -#: Database.py:436 +#: Database.py:443 msgid "Connecting to SQLite: %(database)s" msgstr "" -#: Database.py:448 +#: Database.py:455 msgid "Some database functions will not work without NumPy support" msgstr "" -#: Database.py:469 +#: Database.py:476 msgid "outdated or too new database version (%s) - please recreate tables" msgstr "" -#: Database.py:475 Database.py:476 +#: Database.py:482 Database.py:483 msgid "Failed to read settings table - recreating tables" msgstr "" -#: Database.py:480 Database.py:481 +#: Database.py:487 Database.py:488 msgid "Failed to read settings table - please recreate tables" msgstr "" -#: Database.py:499 -msgid "commit finished ok, i = " -msgstr "" - -#: Database.py:502 +#: Database.py:509 msgid "commit %s failed: info=%s value=%s" msgstr "" -#: Database.py:506 +#: Database.py:513 msgid "commit failed" msgstr "" -#: Database.py:675 Database.py:704 +#: Database.py:682 Database.py:711 msgid "*** Database Error: " msgstr "" -#: Database.py:701 +#: Database.py:708 msgid "Database: date n hands ago = " msgstr "" -#: Database.py:858 +#: Database.py:865 msgid "ERROR: query %s result does not have player_id as first column" msgstr "" -#: Database.py:900 +#: Database.py:907 msgid "getLastInsertId(): problem fetching insert_id? ret=%d" msgstr "" -#: Database.py:912 +#: Database.py:919 msgid "getLastInsertId(%s): problem fetching lastval? row=%d" msgstr "" -#: Database.py:919 +#: Database.py:926 msgid "getLastInsertId(): unknown backend: %d" msgstr "" -#: Database.py:924 +#: Database.py:931 msgid "*** Database get_last_insert_id error: " msgstr "" -#: Database.py:978 Database.py:1398 +#: Database.py:985 Database.py:1407 msgid "warning: drop pg fk %s_%s_fkey failed: %s, continuing ..." msgstr "" -#: Database.py:982 Database.py:1402 +#: Database.py:989 Database.py:1411 msgid "warning: constraint %s_%s_fkey not dropped: %s, continuing ..." msgstr "" -#: Database.py:990 Database.py:1276 +#: Database.py:997 Database.py:1285 msgid "dropping mysql index " msgstr "" -#: Database.py:996 Database.py:1281 Database.py:1289 Database.py:1296 +#: Database.py:1003 Database.py:1290 Database.py:1298 Database.py:1305 msgid " drop index failed: " msgstr "" -#: Database.py:1001 Database.py:1283 +#: Database.py:1008 Database.py:1292 msgid "dropping pg index " msgstr "" -#: Database.py:1014 +#: Database.py:1021 msgid "warning: drop index %s_%s_idx failed: %s, continuing ..." msgstr "" -#: Database.py:1018 +#: Database.py:1025 msgid "warning: index %s_%s_idx not dropped %s, continuing ..." msgstr "" -#: Database.py:1058 Database.py:1066 Database.py:1329 Database.py:1337 +#: Database.py:1065 Database.py:1073 Database.py:1338 Database.py:1346 msgid "creating foreign key " msgstr "" -#: Database.py:1064 Database.py:1085 Database.py:1335 +#: Database.py:1071 Database.py:1092 Database.py:1344 msgid " create foreign key failed: " msgstr "" -#: Database.py:1073 Database.py:1344 +#: Database.py:1080 Database.py:1353 msgid " create foreign key failed: " msgstr "" -#: Database.py:1080 +#: Database.py:1087 msgid "creating mysql index " msgstr "" -#: Database.py:1089 +#: Database.py:1096 msgid "creating pg index " msgstr "" -#: Database.py:1094 +#: Database.py:1101 msgid " create index failed: " msgstr "" -#: Database.py:1134 Database.py:1135 +#: Database.py:1141 Database.py:1142 msgid "Finished recreating tables" msgstr "" -#: Database.py:1172 +#: Database.py:1181 msgid "***Error creating tables: " msgstr "" -#: Database.py:1182 +#: Database.py:1191 msgid "*** Error unable to get databasecursor" msgstr "" -#: Database.py:1194 Database.py:1205 Database.py:1215 Database.py:1222 +#: Database.py:1203 Database.py:1214 Database.py:1224 Database.py:1231 msgid "***Error dropping tables: " msgstr "" -#: Database.py:1220 +#: Database.py:1229 msgid "*** Error in committing table drop" msgstr "" -#: Database.py:1234 Database.py:1235 +#: Database.py:1243 Database.py:1244 msgid "Creating mysql index %s %s" msgstr "" -#: Database.py:1240 Database.py:1249 +#: Database.py:1249 Database.py:1258 msgid " create index failed: " msgstr "" -#: Database.py:1243 Database.py:1244 +#: Database.py:1252 Database.py:1253 msgid "Creating pgsql index %s %s" msgstr "" -#: Database.py:1251 Database.py:1252 +#: Database.py:1260 Database.py:1261 msgid "Creating sqlite index %s %s" msgstr "" -#: Database.py:1257 +#: Database.py:1266 msgid "Create index failed: " msgstr "" -#: Database.py:1259 +#: Database.py:1268 msgid "Unknown database: MySQL, Postgres and SQLite supported" msgstr "" -#: Database.py:1264 +#: Database.py:1273 msgid "Error creating indexes: " msgstr "" -#: Database.py:1291 +#: Database.py:1300 msgid "Dropping sqlite index " msgstr "" -#: Database.py:1298 +#: Database.py:1307 msgid "Fpdb only supports MySQL, Postgres and SQLITE, what are you trying to use?" msgstr "" -#: Database.py:1312 Database.py:1352 +#: Database.py:1321 Database.py:1361 msgid " set_isolation_level failed: " msgstr "" -#: Database.py:1346 Database.py:1405 +#: Database.py:1355 Database.py:1414 msgid "Only MySQL and Postgres supported so far" msgstr "" -#: Database.py:1376 +#: Database.py:1385 msgid "dropping mysql foreign key" msgstr "" -#: Database.py:1380 +#: Database.py:1389 msgid " drop failed: " msgstr "" -#: Database.py:1383 +#: Database.py:1392 msgid "dropping pg foreign key" msgstr "" -#: Database.py:1395 +#: Database.py:1404 msgid "dropped pg foreign key %s_%s_fkey, continuing ..." msgstr "" -#: Database.py:1496 +#: Database.py:1505 msgid "Rebuild hudcache took %.1f seconds" msgstr "" -#: Database.py:1499 Database.py:1532 +#: Database.py:1508 Database.py:1541 msgid "Error rebuilding hudcache:" msgstr "" -#: Database.py:1544 Database.py:1550 +#: Database.py:1553 Database.py:1559 msgid "Error during analyze:" msgstr "" -#: Database.py:1554 +#: Database.py:1563 msgid "Analyze took %.1f seconds" msgstr "" -#: Database.py:1564 Database.py:1570 +#: Database.py:1573 Database.py:1579 msgid "Error during vacuum:" msgstr "" -#: Database.py:1574 +#: Database.py:1583 msgid "Vacuum took %.1f seconds" msgstr "" -#: Database.py:1586 +#: Database.py:1595 msgid "Error during lock_for_insert:" msgstr "" -#: Database.py:1959 +#: Database.py:1992 msgid "queue empty too long - writer stopping ..." msgstr "" -#: Database.py:1962 +#: Database.py:1995 msgid "writer stopping, error reading queue: " msgstr "" -#: Database.py:1987 +#: Database.py:2020 msgid "deadlock detected - trying again ..." msgstr "" -#: Database.py:1992 +#: Database.py:2025 msgid "too many deadlocks - failed to store hand " msgstr "" -#: Database.py:1996 +#: Database.py:2029 msgid "***Error storing hand: " msgstr "" -#: Database.py:2006 +#: Database.py:2039 msgid "db writer finished: stored %d hands (%d fails) in %.1f seconds" msgstr "" -#: Database.py:2016 +#: Database.py:2049 msgid "***Error sending finish: " msgstr "" -#: Database.py:2096 +#: Database.py:2131 msgid "invalid source in Database.createOrUpdateTourney" msgstr "" -#: Database.py:2109 +#: Database.py:2144 msgid "invalid source in Database.createOrUpdateTourneysPlayers" msgstr "" -#: Database.py:2235 +#: Database.py:2270 msgid "HandToWrite.init error: " msgstr "" -#: Database.py:2285 +#: Database.py:2320 msgid "HandToWrite.set_all error: " msgstr "" -#: Database.py:2316 +#: Database.py:2351 msgid "nutOmatic is id_player = %d" msgstr "" -#: Database.py:2324 +#: Database.py:2359 msgid "query plan: " msgstr "" -#: Database.py:2333 +#: Database.py:2368 msgid "cards =" msgstr "" -#: Database.py:2336 +#: Database.py:2371 msgid "get_stats took: %4.3f seconds" msgstr "" -#: Database.py:2338 Tables.py:448 +#: Database.py:2373 Tables.py:448 msgid "press enter to continue" msgstr "" @@ -689,7 +709,7 @@ msgstr "" msgid "auto" msgstr "" -#: GuiBulkImport.py:239 GuiBulkImport.py:289 GuiBulkImport.py:397 +#: GuiBulkImport.py:239 GuiBulkImport.py:289 GuiBulkImport.py:399 msgid "don't drop" msgstr "" @@ -709,8 +729,8 @@ msgstr "" msgid "Drop HudCache:" msgstr "" -#: GuiBulkImport.py:297 -msgid "Import" +#: GuiBulkImport.py:297 fpdb.pyw:832 +msgid "_Bulk Import" msgstr "" #: GuiBulkImport.py:299 @@ -745,35 +765,39 @@ msgstr "" msgid "Do the required conversion for Stars Archive format (ie. as provided by support" msgstr "" -#: GuiBulkImport.py:363 -msgid "USAGE:" -msgstr "" - -#: GuiBulkImport.py:364 -msgid "PokerStars converter: ./GuiBulkImport.py -c PokerStars -f filename" +#: GuiBulkImport.py:360 +msgid "Output the pprinted version of the HandsPlayer hash for regresion testing" msgstr "" #: GuiBulkImport.py:365 -msgid "Full Tilt converter: ./GuiBulkImport.py -c \"Full Tilt Poker\" -f filename" +msgid "USAGE:" msgstr "" #: GuiBulkImport.py:366 -msgid "Everleaf converter: ./GuiBulkImport.py -c Everleaf -f filename" +msgid "PokerStars converter: ./GuiBulkImport.py -c PokerStars -f filename" msgstr "" #: GuiBulkImport.py:367 -msgid "Absolute converter: ./GuiBulkImport.py -c Absolute -f filename" +msgid "Full Tilt converter: ./GuiBulkImport.py -c \"Full Tilt Poker\" -f filename" msgstr "" #: GuiBulkImport.py:368 +msgid "Everleaf converter: ./GuiBulkImport.py -c Everleaf -f filename" +msgstr "" + +#: GuiBulkImport.py:369 +msgid "Absolute converter: ./GuiBulkImport.py -c Absolute -f filename" +msgstr "" + +#: GuiBulkImport.py:370 msgid "PartyPoker converter: ./GuiBulkImport.py -c PartyPoker -f filename" msgstr "" -#: GuiBulkImport.py:384 +#: GuiBulkImport.py:386 msgid "-q is deprecated. Just use \"-f filename\" instead" msgstr "" -#: GuiBulkImport.py:406 +#: GuiBulkImport.py:410 msgid "GuiBulkImport done: Stored: %d \tDuplicates: %d \tPartial: %d \tErrors: %d in %s seconds - %.0f/sec" msgstr "" @@ -793,11 +817,11 @@ msgstr "" msgid "Description" msgstr "" -#: GuiDatabase.py:114 GuiImapFetcher.py:123 +#: GuiDatabase.py:114 GuiImapFetcher.py:119 msgid "Username" msgstr "" -#: GuiDatabase.py:115 GuiImapFetcher.py:123 +#: GuiDatabase.py:115 GuiImapFetcher.py:119 msgid "Password" msgstr "" @@ -829,7 +853,7 @@ msgstr "" msgid " not connected but no exception" msgstr "" -#: GuiDatabase.py:293 fpdb.pyw:906 +#: GuiDatabase.py:293 fpdb.pyw:905 msgid "MySQL Server reports: Access denied. Are your permissions set correctly?" msgstr "" @@ -837,7 +861,7 @@ msgstr "" msgid "MySQL client reports: 2002 or 2003 error. Unable to connect - Please check that the MySQL service has been started" msgstr "" -#: GuiDatabase.py:301 fpdb.pyw:911 +#: GuiDatabase.py:301 fpdb.pyw:910 msgid "Postgres Server reports: Access denied. Are your permissions set correctly?" msgstr "" @@ -958,47 +982,47 @@ msgstr "" msgid "If you change the config you must save before importing" msgstr "" -#: GuiImapFetcher.py:103 +#: GuiImapFetcher.py:98 msgid "Starting import. Please wait." msgstr "" -#: GuiImapFetcher.py:107 +#: GuiImapFetcher.py:103 msgid "Finished import without error." msgstr "" -#: GuiImapFetcher.py:110 +#: GuiImapFetcher.py:106 msgid "Login to mailserver failed: please check mailserver, username and password" msgstr "" -#: GuiImapFetcher.py:113 +#: GuiImapFetcher.py:109 msgid "Could not connect to mailserver: check mailserver and use SSL settings and internet connectivity" msgstr "" -#: GuiImapFetcher.py:123 +#: GuiImapFetcher.py:119 msgid "Fetch Type" msgstr "" -#: GuiImapFetcher.py:123 +#: GuiImapFetcher.py:119 msgid "Mail Folder" msgstr "" -#: GuiImapFetcher.py:123 +#: GuiImapFetcher.py:119 msgid "Mailserver" msgstr "" -#: GuiImapFetcher.py:123 +#: GuiImapFetcher.py:119 msgid "Site" msgstr "" -#: GuiImapFetcher.py:123 +#: GuiImapFetcher.py:119 msgid "Use SSL" msgstr "" -#: GuiImapFetcher.py:154 +#: GuiImapFetcher.py:151 msgid "Yes" msgstr "" -#: GuiImapFetcher.py:155 +#: GuiImapFetcher.py:152 msgid "No" msgstr "" @@ -1117,7 +1141,7 @@ msgid "" "HUD_main: starting ..." msgstr "" -#: HUD_main.pyw:89 fpdb.pyw:876 +#: HUD_main.pyw:89 msgid "Logfile is " msgstr "" @@ -1130,7 +1154,7 @@ msgid "" "Note: error output is being diverted to:\n" msgstr "" -#: HUD_main.pyw:96 fpdb.pyw:1138 +#: HUD_main.pyw:96 fpdb.pyw:1139 msgid "" "\n" "Any major error will be reported there _only_.\n" @@ -1406,7 +1430,7 @@ msgstr "" msgid "TOURNEYS PLAYER IDS" msgstr "" -#: Hand.py:225 Hand.py:1244 +#: Hand.py:225 Hand.py:1242 msgid "[ERROR] Tried to add holecards for unknown player: %s" msgstr "" @@ -1423,206 +1447,226 @@ msgid "FpdbParseError: markStreets appeared to fail: First 100 chars: '%s'" msgstr "" #: Hand.py:323 -msgid "DEBUG: checkPlayerExists %s fail" +msgid "DEBUG: checkPlayerExists %s fail on hand number %s" msgstr "" #: Hand.py:324 -msgid "checkPlayerExists: '%s' failed." +msgid "checkPlayerExists: '%s fail on hand number %s" msgstr "" -#: Hand.py:407 +#: Hand.py:405 msgid "%s %s calls %s" msgstr "" -#: Hand.py:477 +#: Hand.py:475 msgid "%s %s raise %s" msgstr "" -#: Hand.py:488 +#: Hand.py:486 msgid "%s %s bets %s" msgstr "" -#: Hand.py:507 +#: Hand.py:505 msgid "%s %s folds" msgstr "" -#: Hand.py:516 +#: Hand.py:514 msgid "%s %s checks" msgstr "" -#: Hand.py:536 +#: Hand.py:534 msgid "addShownCards %s hole=%s all=%s" msgstr "" -#: Hand.py:647 +#: Hand.py:645 msgid "*** ERROR - HAND: calling writeGameLine with unexpected STARTTIME value, expecting datetime.date object, received:" msgstr "" -#: Hand.py:648 +#: Hand.py:646 msgid "*** Make sure your HandHistoryConverter is setting hand.startTime properly!" msgstr "" -#: Hand.py:649 +#: Hand.py:647 msgid "*** Game String:" msgstr "" -#: Hand.py:703 +#: Hand.py:701 msgid "*** Parse error reading blinds (check compilePlayerRegexs as a likely culprit)" msgstr "" -#: Hand.py:730 +#: Hand.py:728 msgid "HoldemOmahaHand.__init__:Can't assemble hand from db without a handid" msgstr "" -#: Hand.py:732 +#: Hand.py:730 msgid "HoldemOmahaHand.__init__:Neither HHC nor DB+handid provided" msgstr "" -#: Hand.py:1113 +#: Hand.py:1111 msgid "*** DEALING HANDS ***" msgstr "" -#: Hand.py:1118 +#: Hand.py:1116 msgid "Dealt to %s: [%s]" msgstr "" -#: Hand.py:1123 +#: Hand.py:1121 msgid "*** FIRST DRAW ***" msgstr "" -#: Hand.py:1133 +#: Hand.py:1131 msgid "*** SECOND DRAW ***" msgstr "" -#: Hand.py:1143 +#: Hand.py:1141 msgid "*** THIRD DRAW ***" msgstr "" -#: Hand.py:1153 Hand.py:1371 +#: Hand.py:1151 Hand.py:1369 msgid "*** SHOW DOWN ***" msgstr "" -#: Hand.py:1168 Hand.py:1386 +#: Hand.py:1166 Hand.py:1384 msgid "*** SUMMARY ***" msgstr "" -#: Hand.py:1253 +#: Hand.py:1251 msgid "%s %s completes %s" msgstr "" -#: Hand.py:1271 +#: Hand.py:1269 msgid "Bringin: %s, %s" msgstr "" -#: Hand.py:1311 +#: Hand.py:1309 msgid "*** 3RD STREET ***" msgstr "" -#: Hand.py:1325 +#: Hand.py:1323 msgid "*** 4TH STREET ***" msgstr "" -#: Hand.py:1337 +#: Hand.py:1335 msgid "*** 5TH STREET ***" msgstr "" -#: Hand.py:1349 +#: Hand.py:1347 msgid "*** 6TH STREET ***" msgstr "" -#: Hand.py:1359 +#: Hand.py:1357 msgid "*** RIVER ***" msgstr "" -#: Hand.py:1451 +#: Hand.py:1449 msgid "join_holecards: # of holecards should be either < 4, 4 or 7 - 5 and 6 should be impossible for anyone who is not a hero" msgstr "" -#: Hand.py:1452 +#: Hand.py:1450 msgid "join_holcards: holecards(%s): %s" msgstr "" -#: Hand.py:1535 +#: Hand.py:1533 msgid "DEBUG: call Pot.end() before printing pot total" msgstr "" -#: Hand.py:1537 +#: Hand.py:1535 msgid "FpdbError in printing Hand object" msgstr "" -#: HandHistoryConverter.py:134 +#: HandHistoryConverter.py:135 msgid "Failed sanity check" msgstr "" -#: HandHistoryConverter.py:142 +#: HandHistoryConverter.py:143 msgid "Tailing '%s'" msgstr "" -#: HandHistoryConverter.py:149 +#: HandHistoryConverter.py:150 msgid "HHC.start(follow): processHand failed: Exception msg: '%s'" msgstr "" -#: HandHistoryConverter.py:163 +#: HandHistoryConverter.py:154 +msgid "handsList is " +msgstr "" + +#: HandHistoryConverter.py:165 msgid "HHC.start(): processHand failed: Exception msg: '%s'" msgstr "" -#: HandHistoryConverter.py:167 +#: HandHistoryConverter.py:169 msgid "Read %d hands (%d failed) in %.3f seconds" msgstr "" -#: HandHistoryConverter.py:173 +#: HandHistoryConverter.py:175 msgid "Summary file '%s' correctly parsed (took %.3f seconds)" msgstr "" -#: HandHistoryConverter.py:175 +#: HandHistoryConverter.py:177 msgid "Error converting summary file '%s' (took %.3f seconds)" msgstr "" -#: HandHistoryConverter.py:178 +#: HandHistoryConverter.py:180 msgid "Error converting '%s'" msgstr "" -#: HandHistoryConverter.py:209 +#: HandHistoryConverter.py:211 msgid "%s changed inode numbers from %d to %d" msgstr "" -#: HandHistoryConverter.py:254 +#: HandHistoryConverter.py:256 msgid "Converting starsArchive format to readable" msgstr "" -#: HandHistoryConverter.py:259 +#: HandHistoryConverter.py:261 msgid "Converting ftpArchive format to readable" msgstr "" -#: HandHistoryConverter.py:264 +#: HandHistoryConverter.py:266 msgid "Read no hands." msgstr "" -#: HandHistoryConverter.py:401 +#: HandHistoryConverter.py:474 msgid "HH Sanity Check: output and input files are the same, check config" msgstr "" -#: HandHistoryConverter.py:436 +#: HandHistoryConverter.py:497 msgid "Reading stdin with %s" msgstr "" -#: HandHistoryConverter.py:451 +#: HandHistoryConverter.py:512 msgid "unable to read file with any codec in list!" msgstr "" -#: HandHistoryConverter.py:605 +#: HandHistoryConverter.py:579 +msgid " given TZ:" +msgstr "" + +#: HandHistoryConverter.py:579 +msgid "raw time:" +msgstr "" + +#: HandHistoryConverter.py:589 +msgid "changeTimeZone: offset=" +msgstr "" + +#: HandHistoryConverter.py:652 +msgid "utcTime:" +msgstr "" + +#: HandHistoryConverter.py:685 msgid "Unable to create output directory %s for HHC!" msgstr "" -#: HandHistoryConverter.py:606 +#: HandHistoryConverter.py:686 msgid "*** ERROR: UNABLE TO CREATE OUTPUT DIRECTORY" msgstr "" -#: HandHistoryConverter.py:608 +#: HandHistoryConverter.py:688 msgid "Created directory '%s'" msgstr "" -#: HandHistoryConverter.py:612 +#: HandHistoryConverter.py:692 msgid "out_path %s couldn't be opened" msgstr "" @@ -1733,51 +1777,51 @@ msgstr "" msgid "Set max seats" msgstr "" -#: Hud.py:540 +#: Hud.py:543 msgid "Updating config file" msgstr "" -#: Hud.py:549 +#: Hud.py:552 msgid "" "No layout found for %d-max games for site %s\n" msgstr "" -#: Hud.py:563 +#: Hud.py:566 msgid "" "exception in Hud.adj_seats\n" "\n" msgstr "" -#: Hud.py:564 +#: Hud.py:567 msgid "error is %s" msgstr "" -#: Hud.py:571 +#: Hud.py:574 msgid "" "Error finding actual seat.\n" msgstr "" -#: Hud.py:587 +#: Hud.py:590 msgid "" "------------------------------------------------------------\n" "Creating hud from hand %s\n" msgstr "" -#: Hud.py:636 +#: Hud.py:639 msgid "KeyError at the start of the for loop in update in hud_main. How this can possibly happen is totally beyond my comprehension. Your HUD may be about to get really weird. -Eric" msgstr "" -#: Hud.py:637 +#: Hud.py:640 msgid "(btw, the key was %s and statd is %s" msgstr "" -#: Hud.py:944 +#: Hud.py:947 msgid "" "Fake main window, blah blah, blah\n" "blah, blah" msgstr "" -#: Hud.py:952 +#: Hud.py:955 msgid "Table not found." msgstr "" @@ -1785,7 +1829,7 @@ msgstr "" msgid "response to logging in:" msgstr "" -#: ImapFetcher.py:86 +#: ImapFetcher.py:85 msgid "completed running Imap import, closing server connection" msgstr "" @@ -1793,6 +1837,38 @@ msgstr "" msgid "No Name" msgstr "" +#: OnGameToFpdb.py:153 PokerStarsToFpdb.py:189 +msgid "determineGameType: Unable to recognise gametype from: '%s'" +msgstr "" + +#: OnGameToFpdb.py:154 PokerStarsToFpdb.py:190 PokerStarsToFpdb.py:220 +msgid "determineGameType: Raising FpdbParseError" +msgstr "" + +#: OnGameToFpdb.py:155 PokerStarsToFpdb.py:191 +msgid "Unable to recognise gametype from: '%s'" +msgstr "" + +#: OnGameToFpdb.py:235 PartyPokerToFpdb.py:351 PokerStarsToFpdb.py:320 +msgid "readButton: not found" +msgstr "" + +#: OnGameToFpdb.py:250 +msgid "readBlinds starting" +msgstr "" + +#: OnGameToFpdb.py:254 +msgid "re_postSB failed, hand=" +msgstr "" + +#: OnGameToFpdb.py:257 +msgid "readBlinds in noSB exception" +msgstr "" + +#: OnGameToFpdb.py:265 PokerStarsToFpdb.py:358 +msgid "reading antes" +msgstr "" + #: Options.py:40 msgid "If passed error output will go to the console rather than ." msgstr "" @@ -1857,10 +1933,6 @@ msgstr "" msgid "Cannot read GameType for current hand" msgstr "" -#: PartyPokerToFpdb.py:351 PokerStarsToFpdb.py:320 -msgid "readButton: not found" -msgstr "" - #: PartyPokerToFpdb.py:479 msgid "Unimplemented readAction: '%s' '%s'" msgstr "" @@ -1873,18 +1945,6 @@ msgstr "" msgid "in not result starttime" msgstr "" -#: PokerStarsToFpdb.py:189 -msgid "determineGameType: Unable to recognise gametype from: '%s'" -msgstr "" - -#: PokerStarsToFpdb.py:190 PokerStarsToFpdb.py:220 -msgid "determineGameType: Raising FpdbParseError" -msgstr "" - -#: PokerStarsToFpdb.py:191 -msgid "Unable to recognise gametype from: '%s'" -msgstr "" - #: PokerStarsToFpdb.py:221 msgid "Lim_Blinds has no lookup for '%s'" msgstr "" @@ -1893,10 +1953,6 @@ msgstr "" msgid "failed to detect currency" msgstr "" -#: PokerStarsToFpdb.py:358 -msgid "reading antes" -msgstr "" - #: Stats.py:103 msgid "exception getting stat %s for player %s %s" msgstr "" @@ -2321,11 +2377,11 @@ msgstr "" msgid "incrementPlayerWinnings: name : '%s' - Add Winnings (%s)" msgstr "" -#: WinTables.py:70 +#: WinTables.py:82 msgid "Window %s not found. Skipping." msgstr "" -#: WinTables.py:73 +#: WinTables.py:85 msgid "self.window doesn't exist? why?" msgstr "" @@ -2574,10 +2630,6 @@ msgstr "" msgid "B" msgstr "" -#: fpdb.pyw:832 -msgid "_Bulk Import" -msgstr "" - #: fpdb.pyw:833 msgid "I" msgstr "" @@ -2642,7 +2694,7 @@ msgstr "" msgid "P_ositional Stats (tabulated view, not on sqlite)" msgstr "" -#: fpdb.pyw:842 fpdb.pyw:1059 +#: fpdb.pyw:842 fpdb.pyw:1058 msgid "Session Stats" msgstr "" @@ -2702,6 +2754,11 @@ msgstr "" msgid "CONFIG FILE ERROR" msgstr "" +#: fpdb.pyw:876 +msgid "" +"Logfile is %s\n" +msgstr "" + #: fpdb.pyw:878 msgid "Config file" msgstr "" @@ -2720,96 +2777,96 @@ msgstr "" msgid "section of the Preferences window (Main menu) before trying to import hands." msgstr "" -#: fpdb.pyw:904 -msgid "Connected to SQLite: %(database)s" +#: fpdb.pyw:903 +msgid "Connected to SQLite: %s" msgstr "" -#: fpdb.pyw:908 +#: fpdb.pyw:907 msgid "MySQL client reports: 2002 or 2003 error. Unable to connect - " msgstr "" -#: fpdb.pyw:909 +#: fpdb.pyw:908 msgid "Please check that the MySQL service has been started" msgstr "" -#: fpdb.pyw:913 +#: fpdb.pyw:912 msgid "Postgres client reports: Unable to connect - " msgstr "" -#: fpdb.pyw:914 +#: fpdb.pyw:913 msgid "Please check that the Postgres service has been started" msgstr "" -#: fpdb.pyw:938 +#: fpdb.pyw:937 msgid "Strong Warning - Invalid database version" msgstr "" -#: fpdb.pyw:940 +#: fpdb.pyw:939 msgid "An invalid DB version or missing tables have been detected." msgstr "" -#: fpdb.pyw:944 +#: fpdb.pyw:943 msgid "This error is not necessarily fatal but it is strongly recommended that you recreate the tables by using the Database menu." msgstr "" -#: fpdb.pyw:948 +#: fpdb.pyw:947 msgid "Not doing this will likely lead to misbehaviour including fpdb crashes, corrupt data etc." msgstr "" -#: fpdb.pyw:961 +#: fpdb.pyw:960 msgid "Status: Connected to %s database named %s on host %s" msgstr "" -#: fpdb.pyw:971 +#: fpdb.pyw:970 msgid "" "\n" "Global lock taken by" msgstr "" -#: fpdb.pyw:974 +#: fpdb.pyw:973 msgid "" "\n" "Failed to get global lock, it is currently held by" msgstr "" -#: fpdb.pyw:984 +#: fpdb.pyw:983 msgid "Quitting normally" msgstr "" -#: fpdb.pyw:1008 +#: fpdb.pyw:1007 msgid "" "Global lock released.\n" msgstr "" -#: fpdb.pyw:1015 +#: fpdb.pyw:1014 msgid "Auto Import" msgstr "" -#: fpdb.pyw:1022 +#: fpdb.pyw:1021 msgid "Bulk Import" msgstr "" -#: fpdb.pyw:1028 +#: fpdb.pyw:1027 msgid "eMail Import" msgstr "" -#: fpdb.pyw:1035 +#: fpdb.pyw:1034 msgid "Ring Player Stats" msgstr "" -#: fpdb.pyw:1041 +#: fpdb.pyw:1040 msgid "Tourney Player Stats" msgstr "" -#: fpdb.pyw:1047 +#: fpdb.pyw:1046 msgid "Tourney Viewer" msgstr "" -#: fpdb.pyw:1053 +#: fpdb.pyw:1052 msgid "Positional Stats" msgstr "" -#: fpdb.pyw:1063 +#: fpdb.pyw:1062 msgid "" "Fpdb needs translators!\n" "If you speak another language and have a few minutes or more to spare get in touch by emailing steffen@schaumburger.info\n" @@ -2830,40 +2887,40 @@ msgid "" "You can find the full license texts in agpl-3.0.txt, gpl-2.0.txt, gpl-3.0.txt and mit.txt in the fpdb installation directory." msgstr "" -#: fpdb.pyw:1080 +#: fpdb.pyw:1079 msgid "Help" msgstr "" -#: fpdb.pyw:1087 +#: fpdb.pyw:1086 msgid "Graphs" msgstr "" -#: fpdb.pyw:1137 +#: fpdb.pyw:1138 msgid "" "\n" "Note: error output is being diverted to fpdb-errors.txt and HUD-errors.txt in:\n" msgstr "" -#: fpdb.pyw:1166 +#: fpdb.pyw:1167 msgid "fpdb starting ..." msgstr "" -#: fpdb.pyw:1215 +#: fpdb.pyw:1224 msgid "FPDB WARNING" msgstr "" -#: fpdb.pyw:1234 +#: fpdb.pyw:1243 msgid "" "WARNING: Unable to find output hh directory %s\n" "\n" " Press YES to create this directory, or NO to select a new one." msgstr "" -#: fpdb.pyw:1242 +#: fpdb.pyw:1251 msgid "WARNING: Unable to create hand output directory. Importing is not likely to work until this is fixed." msgstr "" -#: fpdb.pyw:1247 +#: fpdb.pyw:1256 msgid "Select HH Output Directory" msgstr "" @@ -2875,87 +2932,87 @@ msgstr "" msgid "Import database module: psycopg2 not found" msgstr "" -#: fpdb_import.py:178 +#: fpdb_import.py:189 msgid "Database ID for %s not found" msgstr "" -#: fpdb_import.py:180 +#: fpdb_import.py:191 msgid "[ERROR] More than 1 Database ID found for %s - Multiple currencies not implemented yet" msgstr "" -#: fpdb_import.py:216 +#: fpdb_import.py:227 msgid "Attempted to add non-directory: '%s' as an import directory" msgstr "" -#: fpdb_import.py:226 +#: fpdb_import.py:237 msgid "Started at %s -- %d files to import. indexes: %s" msgstr "" -#: fpdb_import.py:235 +#: fpdb_import.py:246 msgid "No need to drop indexes." msgstr "" -#: fpdb_import.py:254 +#: fpdb_import.py:265 msgid "writers finished already" msgstr "" -#: fpdb_import.py:257 +#: fpdb_import.py:268 msgid "waiting for writers to finish ..." msgstr "" -#: fpdb_import.py:267 +#: fpdb_import.py:278 msgid " ... writers finished" msgstr "" -#: fpdb_import.py:273 +#: fpdb_import.py:284 msgid "No need to rebuild indexes." msgstr "" -#: fpdb_import.py:277 +#: fpdb_import.py:288 msgid "No need to rebuild hudcache." msgstr "" -#: fpdb_import.py:302 +#: fpdb_import.py:313 msgid "sending finish msg qlen =" msgstr "" -#: fpdb_import.py:428 fpdb_import.py:430 +#: fpdb_import.py:439 fpdb_import.py:441 msgid "Converting " msgstr "" -#: fpdb_import.py:466 +#: fpdb_import.py:477 msgid "Hand processed but empty" msgstr "" -#: fpdb_import.py:479 +#: fpdb_import.py:490 msgid "fpdb_import: sending hand to hud" msgstr "" -#: fpdb_import.py:482 +#: fpdb_import.py:493 msgid "Failed to send hand to HUD: %s" msgstr "" -#: fpdb_import.py:493 +#: fpdb_import.py:508 msgid "Unknown filter filter_name:'%s' in filter:'%s'" msgstr "" -#: fpdb_import.py:504 +#: fpdb_import.py:519 msgid "Error No.%s please send the hand causing this to fpdb-main@lists.sourceforge.net so we can fix the problem." msgstr "" -#: fpdb_import.py:505 +#: fpdb_import.py:520 msgid "Filename:" msgstr "" -#: fpdb_import.py:506 +#: fpdb_import.py:521 msgid "Here is the first line of the hand so you can identify it. Please mention that the error was a ValueError:" msgstr "" -#: fpdb_import.py:508 +#: fpdb_import.py:523 msgid "Hand logged to hand-errors.txt" msgstr "" -#: fpdb_import.py:516 +#: fpdb_import.py:531 msgid "CLI for fpdb_import is now available as CliFpdb.py" msgstr "" From acfc110d0378ef90b159c896f5aab657a72cdb5e Mon Sep 17 00:00:00 2001 From: steffen123 Date: Mon, 23 Aug 2010 07:28:30 +0200 Subject: [PATCH 5/5] remove remaining calls to removed config section --- pyfpdb/AlchemyTables.py | 1 - pyfpdb/GuiAutoImport.py | 1 - pyfpdb/GuiBulkImport.py | 1 - pyfpdb/GuiPositionalStats.py | 1 - pyfpdb/GuiRingPlayerStats.py | 1 - pyfpdb/GuiSessionViewer.py | 1 - pyfpdb/TestHandsPlayers.py | 2 +- pyfpdb/test_Betfair.py | 1 - pyfpdb/test_PokerStars.py | 1 - 9 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pyfpdb/AlchemyTables.py b/pyfpdb/AlchemyTables.py index c74665b1..e89380a7 100644 --- a/pyfpdb/AlchemyTables.py +++ b/pyfpdb/AlchemyTables.py @@ -450,7 +450,6 @@ def sss(): self.settings['os']="windows" self.settings.update(self.config.get_db_parameters()) - self.settings.update(self.config.get_tv_parameters()) self.settings.update(self.config.get_import_parameters()) self.settings.update(self.config.get_default_paths()) diff --git a/pyfpdb/GuiAutoImport.py b/pyfpdb/GuiAutoImport.py index 1d4c2053..c386f475 100755 --- a/pyfpdb/GuiAutoImport.py +++ b/pyfpdb/GuiAutoImport.py @@ -334,7 +334,6 @@ if __name__== "__main__": else: settings['os'] = 'linuxmac' settings.update(config.get_db_parameters('fpdb')) - settings.update(config.get_tv_parameters()) settings.update(config.get_import_parameters()) settings.update(config.get_default_paths()) diff --git a/pyfpdb/GuiBulkImport.py b/pyfpdb/GuiBulkImport.py index dc023e01..943a81fd 100755 --- a/pyfpdb/GuiBulkImport.py +++ b/pyfpdb/GuiBulkImport.py @@ -378,7 +378,6 @@ def main(argv=None): else: settings['os'] = 'linuxmac' settings.update(config.get_db_parameters()) - settings.update(config.get_tv_parameters()) settings.update(config.get_import_parameters()) settings.update(config.get_default_paths()) diff --git a/pyfpdb/GuiPositionalStats.py b/pyfpdb/GuiPositionalStats.py index 4963a88f..2f7c36cc 100644 --- a/pyfpdb/GuiPositionalStats.py +++ b/pyfpdb/GuiPositionalStats.py @@ -53,7 +53,6 @@ class GuiPositionalStats (threading.Thread): settings = {} settings.update(self.conf.get_db_parameters()) - settings.update(self.conf.get_tv_parameters()) settings.update(self.conf.get_import_parameters()) settings.update(self.conf.get_default_paths()) diff --git a/pyfpdb/GuiRingPlayerStats.py b/pyfpdb/GuiRingPlayerStats.py index 081e1b70..ef519290 100644 --- a/pyfpdb/GuiRingPlayerStats.py +++ b/pyfpdb/GuiRingPlayerStats.py @@ -69,7 +69,6 @@ class GuiRingPlayerStats (GuiPlayerStats.GuiPlayerStats): settings = {} settings.update(self.conf.get_db_parameters()) - settings.update(self.conf.get_tv_parameters()) settings.update(self.conf.get_import_parameters()) settings.update(self.conf.get_default_paths()) diff --git a/pyfpdb/GuiSessionViewer.py b/pyfpdb/GuiSessionViewer.py index 56df5e78..d4ffaccc 100755 --- a/pyfpdb/GuiSessionViewer.py +++ b/pyfpdb/GuiSessionViewer.py @@ -82,7 +82,6 @@ class GuiSessionViewer (threading.Thread): settings = {} settings.update(self.conf.get_db_parameters()) - settings.update(self.conf.get_tv_parameters()) settings.update(self.conf.get_import_parameters()) settings.update(self.conf.get_default_paths()) diff --git a/pyfpdb/TestHandsPlayers.py b/pyfpdb/TestHandsPlayers.py index a49cd88b..6179e11d 100644 --- a/pyfpdb/TestHandsPlayers.py +++ b/pyfpdb/TestHandsPlayers.py @@ -1,3 +1,4 @@ +# -*- coding: utf-8 -*- import sys import os import codecs @@ -76,7 +77,6 @@ def main(argv=None): sql = SQL.Sql(db_server = 'sqlite') settings = {} settings.update(config.get_db_parameters()) - settings.update(config.get_tv_parameters()) settings.update(config.get_import_parameters()) settings.update(config.get_default_paths()) db.recreate_tables() diff --git a/pyfpdb/test_Betfair.py b/pyfpdb/test_Betfair.py index 231b1bf3..aba5655b 100644 --- a/pyfpdb/test_Betfair.py +++ b/pyfpdb/test_Betfair.py @@ -30,7 +30,6 @@ sql = SQL.Sql(db_server = 'sqlite') settings = {} settings.update(config.get_db_parameters()) -settings.update(config.get_tv_parameters()) settings.update(config.get_import_parameters()) settings.update(config.get_default_paths()) diff --git a/pyfpdb/test_PokerStars.py b/pyfpdb/test_PokerStars.py index 5178adef..5824c471 100755 --- a/pyfpdb/test_PokerStars.py +++ b/pyfpdb/test_PokerStars.py @@ -30,7 +30,6 @@ sql = SQL.Sql(db_server = 'sqlite') settings = {} settings.update(config.get_db_parameters()) -settings.update(config.get_tv_parameters()) settings.update(config.get_import_parameters()) settings.update(config.get_default_paths())