From 1f86ca0d40163a9b587613ed8479fd423fd13a07 Mon Sep 17 00:00:00 2001 From: Erki Ferenc Date: Thu, 24 Feb 2011 12:09:18 +0100 Subject: [PATCH 1/6] l10n: updated Hungarian translation --- pyfpdb/locale/fpdb-hu_HU.po | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pyfpdb/locale/fpdb-hu_HU.po b/pyfpdb/locale/fpdb-hu_HU.po index 1661f8f2..49bf53b5 100644 --- a/pyfpdb/locale/fpdb-hu_HU.po +++ b/pyfpdb/locale/fpdb-hu_HU.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.20.905 plus git\n" "POT-Creation-Date: 2011-02-23 16:58+CET\n" -"PO-Revision-Date: 2011-02-20 21:27+0100\n" +"PO-Revision-Date: 2011-02-24 12:08+0100\n" "Last-Translator: Ferenc Erki \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -654,7 +654,7 @@ msgstr "Versenyek" #: Filters.py:80 msgid "DEBUG: New packing box created!" -msgstr "" +msgstr "DEBUG: Új csoportosító doboz létrehozva!" #: Filters.py:106 TourneyFilters.py:114 msgid "Either 0 or more than one site matched (%s) - EEK" @@ -714,20 +714,19 @@ msgstr "Nem található játék az adatbázisban" #: Filters.py:827 msgid "Graphing Options:" -msgstr "" +msgstr "Grafikon opciók:" #: Filters.py:839 msgid "Show Graph In:" -msgstr "" +msgstr "Profit:" #: Filters.py:859 msgid "Showdown Winnings" -msgstr "" +msgstr "Nyeremény mutatással" #: Filters.py:867 -#, fuzzy msgid "Non-Showdown Winnings" -msgstr "Mutatás nélkül: $%.2f" +msgstr "Nyeremény mutatás nélkül" #: Filters.py:984 msgid "From:" @@ -842,9 +841,8 @@ msgid " Start _Auto Import " msgstr " _Auto Import indítása " #: GuiAutoImport.py:125 -#, fuzzy msgid "Detect Directories" -msgstr "'%s' könyvtár létrehozva" +msgstr "Könyvtárak felismerése" #: GuiAutoImport.py:144 msgid "Auto Import Ready." @@ -3117,10 +3115,11 @@ msgstr "Nem sikerült az utcák hozzáadása. handtext=%s" #: XTables.py:70 msgid "Could not retrieve XID from table xwininfo. xwininfo is %s" msgstr "" +"Nem sikerült az XID meghatározása az asztal xwininfo-jából. Az xwininfo: %s" #: XTables.py:74 msgid "No match in XTables for table '%s'." -msgstr "" +msgstr "Nincs találat az XTables-ben ehhez az asztalhoz: '%s'" #: fpdb.pyw:38 msgid " - press return to continue\n" From 25799d01f209b03f21904eb79f78affc63dfee15 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Fri, 25 Feb 2011 04:19:00 -0500 Subject: [PATCH 2/6] Don't bother recompiling regexs for every hand when parsing Stars HHs. --- pyfpdb/PokerStarsToFpdb.py | 41 +++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py index 67d8c433..4096ca92 100644 --- a/pyfpdb/PokerStarsToFpdb.py +++ b/pyfpdb/PokerStarsToFpdb.py @@ -131,34 +131,29 @@ class PokerStars(HandHistoryConverter): # revised re including timezone (not currently used): #re_DateTime = re.compile("""(?P[0-9]{4})\/(?P[0-9]{2})\/(?P[0-9]{2})[\- ]+(?P[0-9]+):(?P[0-9]+):(?P[0-9]+) \(?(?P[A-Z0-9]+)""", re.MULTILINE) - def compilePlayerRegexs(self, hand): - players = set([player[1] for player in hand.players]) - if not players <= self.compiledPlayers: # x <= y means 'x is subset of y' - # we need to recompile the player regexs. -# TODO: should probably rename re_HeroCards and corresponding method, -# since they are used to find all cards on lines starting with "Dealt to:" -# They still identify the hero. - self.compiledPlayers = players - player_re = "(?P" + "|".join(map(re.escape, players)) + ")" - subst = {'PLYR': player_re, 'CUR': self.sym[hand.gametype['currency']]} - log.debug("player_re: " + player_re) - self.re_PostSB = re.compile(r"^%(PLYR)s: posts small blind %(CUR)s(?P[.0-9]+)" % subst, re.MULTILINE) - self.re_PostBB = re.compile(r"^%(PLYR)s: posts big blind %(CUR)s(?P[.0-9]+)" % subst, re.MULTILINE) - self.re_Antes = re.compile(r"^%(PLYR)s: posts the ante %(CUR)s(?P[.0-9]+)" % subst, re.MULTILINE) - self.re_BringIn = re.compile(r"^%(PLYR)s: brings[- ]in( low|) for %(CUR)s(?P[.0-9]+)" % subst, re.MULTILINE) - self.re_PostBoth = re.compile(r"^%(PLYR)s: posts small \& big blinds %(CUR)s(?P[.0-9]+)" % subst, re.MULTILINE) - self.re_HeroCards = re.compile(r"^Dealt to %(PLYR)s(?: \[(?P.+?)\])?( \[(?P.+?)\])" % subst, re.MULTILINE) - self.re_Action = re.compile(r""" + # These used to be compiled per player, but regression tests say + # we don't have to, and it makes life faster. + short_subst = {'PLYR': r'(?P.+?)', 'CUR': '\$?'} + re_PostSB = re.compile(r"^%(PLYR)s: posts small blind %(CUR)s(?P[.0-9]+)" % short_subst, re.MULTILINE) + re_PostBB = re.compile(r"^%(PLYR)s: posts big blind %(CUR)s(?P[.0-9]+)" % short_subst, re.MULTILINE) + re_Antes = re.compile(r"^%(PLYR)s: posts the ante %(CUR)s(?P[.0-9]+)" % short_subst, re.MULTILINE) + re_BringIn = re.compile(r"^%(PLYR)s: brings[- ]in( low|) for %(CUR)s(?P[.0-9]+)" % short_subst, re.MULTILINE) + re_PostBoth = re.compile(r"^%(PLYR)s: posts small \& big blinds %(CUR)s(?P[.0-9]+)" % short_subst, re.MULTILINE) + re_HeroCards = re.compile(r"^Dealt to %(PLYR)s(?: \[(?P.+?)\])?( \[(?P.+?)\])" % short_subst, re.MULTILINE) + re_Action = re.compile(r""" ^%(PLYR)s:(?P\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat) (\s(%(CUR)s)?(?P[.\d]+))?(\sto\s%(CUR)s(?P[.\d]+))? # the number discarded goes in \s*(and\sis\sall.in)? (and\shas\sreached\sthe\s[%(CUR)s\d\.]+\scap)? (\scards?(\s\[(?P.+?)\])?)?\s*$""" - % subst, re.MULTILINE|re.VERBOSE) - self.re_ShowdownAction = re.compile(r"^%s: shows \[(?P.*)\]" % player_re, re.MULTILINE) - self.re_CollectPot = re.compile(r"Seat (?P[0-9]+): %(PLYR)s (\(button\) |\(small blind\) |\(big blind\) |\(button\) \(small blind\) |\(button\) \(big blind\) )?(collected|showed \[.*\] and won) \(%(CUR)s(?P[.\d]+)\)(, mucked| with.*|)" % subst, re.MULTILINE) - self.re_sitsOut = re.compile("^%s sits out" % player_re, re.MULTILINE) - self.re_ShownCards = re.compile("^Seat (?P[0-9]+): %s (\(.*\) )?(?Pshowed|mucked) \[(?P.*)\].*" % player_re, re.MULTILINE) + % short_subst, re.MULTILINE|re.VERBOSE) + re_ShowdownAction = re.compile(r"^%s: shows \[(?P.*)\]" % short_subst['PLYR'], re.MULTILINE) + re_sitsOut = re.compile("^%s sits out" % short_subst['PLYR'], re.MULTILINE) + re_ShownCards = re.compile("^Seat (?P[0-9]+): %s (\(.*\) )?(?Pshowed|mucked) \[(?P.*)\].*" % short_subst['PLYR'], re.MULTILINE) + re_CollectPot = re.compile(r"Seat (?P[0-9]+): %(PLYR)s (\(button\) |\(small blind\) |\(big blind\) |\(button\) \(small blind\) |\(button\) \(big blind\) )?(collected|showed \[.*\] and won) \(%(CUR)s(?P[.\d]+)\)(, mucked| with.*|)" % short_subst, re.MULTILINE) + + def compilePlayerRegexs(self, hand): + pass def readSupportedGames(self): return [["ring", "hold", "nl"], From 2f067d7945ec3e24fe999490624860920d0025c4 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Fri, 25 Feb 2011 13:46:00 +0100 Subject: [PATCH 3/6] a missed l10n string --- pyfpdb/TableWindow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/TableWindow.py b/pyfpdb/TableWindow.py index 4cab43ad..72151d13 100644 --- a/pyfpdb/TableWindow.py +++ b/pyfpdb/TableWindow.py @@ -142,7 +142,7 @@ class Table_Window(object): if self.number is not None: break trys += 1 if trys > 4: - log.error("Can't find table %s" % table_name) + log.error(_("Can't find table %s") % table_name) return None geo = self.get_geometry() From 140ad6be5f795b127e98d293bbbfaaaaf7d5fa55 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Fri, 25 Feb 2011 14:31:15 +0100 Subject: [PATCH 4/6] allow it to start when cdecimal is missing --- pyfpdb/Database.py | 7 ++++++- pyfpdb/decimal.py | 4 ---- 2 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 pyfpdb/decimal.py diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index a459c883..f06ee64b 100644 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -38,7 +38,12 @@ import sys import traceback from datetime import datetime, date, time, timedelta from time import time, strftime, sleep -from decimal import Decimal + +try: + from cdecimal import * +except ImportError: + from decimal import * + import string import re import Queue diff --git a/pyfpdb/decimal.py b/pyfpdb/decimal.py deleted file mode 100644 index e5202d92..00000000 --- a/pyfpdb/decimal.py +++ /dev/null @@ -1,4 +0,0 @@ -try: - from cdecimal import * -except ImportError: - from decimal import * From fc46b70c413d5b2ecd554a154afab1eab6e95560 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Fri, 25 Feb 2011 14:18:12 -0500 Subject: [PATCH 5/6] Rename decimal.py to decimal_wrapper.py so we don't break when cdecimal is not installed. --- pyfpdb/AlchemyFacilities.py | 2 +- pyfpdb/AlchemyMappings.py | 2 +- pyfpdb/CarbonToFpdb.py | 2 +- pyfpdb/Database.py | 2 +- pyfpdb/DerivedStats.py | 2 +- pyfpdb/EverestToFpdb.py | 2 +- pyfpdb/FullTiltPokerSummary.py | 2 +- pyfpdb/Hand.py | 2 +- pyfpdb/HandHistoryConverter.py | 2 +- pyfpdb/OnGameToFpdb.py | 2 +- pyfpdb/PokerStarsSummary.py | 2 +- pyfpdb/PokerStarsToFpdb.py | 2 +- pyfpdb/SitenameSummary.py | 2 +- pyfpdb/TourneySummary.py | 2 +- pyfpdb/WinamaxSummary.py | 2 +- pyfpdb/WinamaxToFpdb.py | 2 +- pyfpdb/{decimal.py => decimal_wrapper.py} | 0 pyfpdb/iPokerToFpdb.py | 2 +- 18 files changed, 17 insertions(+), 17 deletions(-) rename pyfpdb/{decimal.py => decimal_wrapper.py} (100%) diff --git a/pyfpdb/AlchemyFacilities.py b/pyfpdb/AlchemyFacilities.py index fd2082d1..a7f85cd7 100644 --- a/pyfpdb/AlchemyFacilities.py +++ b/pyfpdb/AlchemyFacilities.py @@ -17,7 +17,7 @@ #TODO: gettextify if file is used again -from decimal import Decimal +from decimal_wrapper import Decimal from sqlalchemy import types from sqlalchemy.orm.exc import NoResultFound diff --git a/pyfpdb/AlchemyMappings.py b/pyfpdb/AlchemyMappings.py index b5891c25..a0ddcd25 100644 --- a/pyfpdb/AlchemyMappings.py +++ b/pyfpdb/AlchemyMappings.py @@ -23,7 +23,7 @@ This package contains all classes to be mapped and mappers themselves import logging import re -from decimal import Decimal +from decimal_wrapper import Decimal from sqlalchemy.orm import mapper, relation, reconstructor from sqlalchemy.sql import select from collections import defaultdict diff --git a/pyfpdb/CarbonToFpdb.py b/pyfpdb/CarbonToFpdb.py index b9d80791..2c5dbd5b 100644 --- a/pyfpdb/CarbonToFpdb.py +++ b/pyfpdb/CarbonToFpdb.py @@ -53,7 +53,7 @@ _ = L10n.get_translation() import sys import logging from HandHistoryConverter import * -from decimal import Decimal +from decimal_wrapper import Decimal class Carbon(HandHistoryConverter): diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index 6340660d..2e864e21 100644 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -38,7 +38,7 @@ import sys import traceback from datetime import datetime, date, time, timedelta from time import time, strftime, sleep -from decimal import Decimal +from decimal_wrapper import Decimal import string import re import Queue diff --git a/pyfpdb/DerivedStats.py b/pyfpdb/DerivedStats.py index 93c09571..86a363f3 100644 --- a/pyfpdb/DerivedStats.py +++ b/pyfpdb/DerivedStats.py @@ -17,7 +17,7 @@ #fpdb modules import Card -from decimal import Decimal +from decimal_wrapper import Decimal import logging # logging has been set up in fpdb.py or HUD_main.py, use their settings: diff --git a/pyfpdb/EverestToFpdb.py b/pyfpdb/EverestToFpdb.py index f910ba2f..a9abebc1 100644 --- a/pyfpdb/EverestToFpdb.py +++ b/pyfpdb/EverestToFpdb.py @@ -25,7 +25,7 @@ _ = L10n.get_translation() import sys import logging from HandHistoryConverter import * -from decimal import Decimal +from decimal_wrapper import Decimal class Everest(HandHistoryConverter): diff --git a/pyfpdb/FullTiltPokerSummary.py b/pyfpdb/FullTiltPokerSummary.py index 2edcd81e..1172d27c 100644 --- a/pyfpdb/FullTiltPokerSummary.py +++ b/pyfpdb/FullTiltPokerSummary.py @@ -20,7 +20,7 @@ import L10n _ = L10n.get_translation() -from decimal import Decimal +from decimal_wrapper import Decimal import datetime from Exceptions import FpdbParseError diff --git a/pyfpdb/Hand.py b/pyfpdb/Hand.py index 6e642c20..506b6114 100644 --- a/pyfpdb/Hand.py +++ b/pyfpdb/Hand.py @@ -25,7 +25,7 @@ import sys import traceback import os import os.path -from decimal import Decimal +from decimal_wrapper import Decimal import operator import time,datetime from copy import deepcopy diff --git a/pyfpdb/HandHistoryConverter.py b/pyfpdb/HandHistoryConverter.py index 3f0c51bd..8cf45f02 100644 --- a/pyfpdb/HandHistoryConverter.py +++ b/pyfpdb/HandHistoryConverter.py @@ -26,7 +26,7 @@ import os import os.path import xml.dom.minidom import codecs -from decimal import Decimal +from decimal_wrapper import Decimal import operator from xml.dom.minidom import Node diff --git a/pyfpdb/OnGameToFpdb.py b/pyfpdb/OnGameToFpdb.py index 889f2d24..a7423c00 100755 --- a/pyfpdb/OnGameToFpdb.py +++ b/pyfpdb/OnGameToFpdb.py @@ -31,7 +31,7 @@ log = logging.getLogger("parser") import Configuration from HandHistoryConverter import * -from decimal import Decimal +from decimal_wrapper import Decimal # OnGame HH Format diff --git a/pyfpdb/PokerStarsSummary.py b/pyfpdb/PokerStarsSummary.py index 01a9223b..4caa7a3f 100644 --- a/pyfpdb/PokerStarsSummary.py +++ b/pyfpdb/PokerStarsSummary.py @@ -20,7 +20,7 @@ import L10n _ = L10n.get_translation() -from decimal import Decimal +from decimal_wrapper import Decimal import datetime from Exceptions import FpdbParseError diff --git a/pyfpdb/PokerStarsToFpdb.py b/pyfpdb/PokerStarsToFpdb.py index 4096ca92..060ad85c 100644 --- a/pyfpdb/PokerStarsToFpdb.py +++ b/pyfpdb/PokerStarsToFpdb.py @@ -25,7 +25,7 @@ _ = L10n.get_translation() import sys from HandHistoryConverter import * -from decimal import Decimal +from decimal_wrapper import Decimal # PokerStars HH Format diff --git a/pyfpdb/SitenameSummary.py b/pyfpdb/SitenameSummary.py index d06b9831..f3b76700 100644 --- a/pyfpdb/SitenameSummary.py +++ b/pyfpdb/SitenameSummary.py @@ -20,7 +20,7 @@ import L10n _ = L10n.get_translation() -from decimal import Decimal +from decimal_wrapper import Decimal import datetime from Exceptions import FpdbParseError diff --git a/pyfpdb/TourneySummary.py b/pyfpdb/TourneySummary.py index d83ac1a8..1def7703 100644 --- a/pyfpdb/TourneySummary.py +++ b/pyfpdb/TourneySummary.py @@ -28,7 +28,7 @@ import traceback import logging import os import os.path -from decimal import Decimal +from decimal_wrapper import Decimal import operator import time,datetime from copy import deepcopy diff --git a/pyfpdb/WinamaxSummary.py b/pyfpdb/WinamaxSummary.py index c3a5bd14..c466fbd2 100644 --- a/pyfpdb/WinamaxSummary.py +++ b/pyfpdb/WinamaxSummary.py @@ -18,7 +18,7 @@ import L10n _ = L10n.get_translation() -from decimal import Decimal +from decimal_wrapper import Decimal import datetime from BeautifulSoup import BeautifulSoup diff --git a/pyfpdb/WinamaxToFpdb.py b/pyfpdb/WinamaxToFpdb.py index 6aa6f51c..d0540ec0 100644 --- a/pyfpdb/WinamaxToFpdb.py +++ b/pyfpdb/WinamaxToFpdb.py @@ -29,7 +29,7 @@ import logging import Configuration from HandHistoryConverter import * -from decimal import Decimal +from decimal_wrapper import Decimal import time # Winamax HH Format diff --git a/pyfpdb/decimal.py b/pyfpdb/decimal_wrapper.py similarity index 100% rename from pyfpdb/decimal.py rename to pyfpdb/decimal_wrapper.py diff --git a/pyfpdb/iPokerToFpdb.py b/pyfpdb/iPokerToFpdb.py index 4766d72e..950a9901 100644 --- a/pyfpdb/iPokerToFpdb.py +++ b/pyfpdb/iPokerToFpdb.py @@ -46,7 +46,7 @@ _ = L10n.get_translation() import sys import logging from HandHistoryConverter import * -from decimal import Decimal +from decimal_wrapper import Decimal class iPoker(HandHistoryConverter): From 3e0cf8b2da25e496aceba382085db32ee2f00aaf Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Sat, 26 Feb 2011 02:36:31 +0100 Subject: [PATCH 6/6] add missing windows py27 links --- packaging/windows/py27-links.txt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/packaging/windows/py27-links.txt b/packaging/windows/py27-links.txt index 8005ec8d..cb1e413c 100644 --- a/packaging/windows/py27-links.txt +++ b/packaging/windows/py27-links.txt @@ -1,9 +1,16 @@ +This is a list of download links of Windows packages for Python 2.7 of our dependencies. + + +These are as of 26Feb2011: +matplotlib 1.0.1 ... http://sourceforge.net/projects/matplotlib/files/matplotlib/matplotlib-1.0.1/ +pygtk 2.22 ... http://ftp.gnome.org/pub/GNOME/binaries/win32/pygtk/2.22/ +pycairo 1.8.10 ... http://ftp.gnome.org/pub/GNOME/binaries/win32/pycairo/1.8/ +pyGobject X ... http://ftp.gnome.org/pub/GNOME/binaries/win32/pygobject/2.26/ + + +The below are from Aug2010, and should probably be updated to newer versions: Python 2.7 ... http://python.org/ftp/python/2.7/python-2.7.msi pywin 214 ... https://sourceforge.net/projects/pywin32/files/pywin32/Build%20214/pywin32-214.win32-py2.7.exe/download -matplotlib X ... not available as py27 as of 16aug2010: https://sourceforge.net/projects/matplotlib/files/matplotlib/ -pygtk X ... not available as py27 as of 16aug2010: http://ftp.gnome.org/pub/GNOME/binaries/win32/pygtk/ -pycairo X ... not available as py27 as of 16aug2010: http://ftp.gnome.org/pub/GNOME/binaries/win32/pycairo/ -pyGobject X ... not available as py27 as of 16aug2010: http://ftp.gnome.org/pub/GNOME/binaries/win32/pygobject/ py2exe 0.6.9 ... https://sourceforge.net/projects/py2exe/files/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe/download psycopg2 ... http://www.stickpeople.com/projects/python/win-psycopg/psycopg2-2.2.2.win32-py2.7-pg8.4.4-release.exe