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

This commit is contained in:
Eric Blade 2011-02-25 21:00:39 -05:00
commit 393b51971a
21 changed files with 56 additions and 55 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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):

View File

@ -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

View File

@ -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:

View File

@ -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):

View File

@ -20,7 +20,7 @@
import L10n
_ = L10n.get_translation()
from decimal import Decimal
from decimal_wrapper import Decimal
import datetime
from Exceptions import FpdbParseError

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -20,7 +20,7 @@
import L10n
_ = L10n.get_translation()
from decimal import Decimal
from decimal_wrapper import Decimal
import datetime
from Exceptions import FpdbParseError

View File

@ -25,7 +25,7 @@ _ = L10n.get_translation()
import sys
from HandHistoryConverter import *
from decimal import Decimal
from decimal_wrapper import Decimal
# PokerStars HH Format
@ -131,34 +131,29 @@ class PokerStars(HandHistoryConverter):
# revised re including timezone (not currently used):
#re_DateTime = re.compile("""(?P<Y>[0-9]{4})\/(?P<M>[0-9]{2})\/(?P<D>[0-9]{2})[\- ]+(?P<H>[0-9]+):(?P<MIN>[0-9]+):(?P<S>[0-9]+) \(?(?P<TZ>[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<PNAME>" + "|".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<SB>[.0-9]+)" % subst, re.MULTILINE)
self.re_PostBB = re.compile(r"^%(PLYR)s: posts big blind %(CUR)s(?P<BB>[.0-9]+)" % subst, re.MULTILINE)
self.re_Antes = re.compile(r"^%(PLYR)s: posts the ante %(CUR)s(?P<ANTE>[.0-9]+)" % subst, re.MULTILINE)
self.re_BringIn = re.compile(r"^%(PLYR)s: brings[- ]in( low|) for %(CUR)s(?P<BRINGIN>[.0-9]+)" % subst, re.MULTILINE)
self.re_PostBoth = re.compile(r"^%(PLYR)s: posts small \& big blinds %(CUR)s(?P<SBBB>[.0-9]+)" % subst, re.MULTILINE)
self.re_HeroCards = re.compile(r"^Dealt to %(PLYR)s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % 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<PNAME>.+?)', 'CUR': '\$?'}
re_PostSB = re.compile(r"^%(PLYR)s: posts small blind %(CUR)s(?P<SB>[.0-9]+)" % short_subst, re.MULTILINE)
re_PostBB = re.compile(r"^%(PLYR)s: posts big blind %(CUR)s(?P<BB>[.0-9]+)" % short_subst, re.MULTILINE)
re_Antes = re.compile(r"^%(PLYR)s: posts the ante %(CUR)s(?P<ANTE>[.0-9]+)" % short_subst, re.MULTILINE)
re_BringIn = re.compile(r"^%(PLYR)s: brings[- ]in( low|) for %(CUR)s(?P<BRINGIN>[.0-9]+)" % short_subst, re.MULTILINE)
re_PostBoth = re.compile(r"^%(PLYR)s: posts small \& big blinds %(CUR)s(?P<SBBB>[.0-9]+)" % short_subst, re.MULTILINE)
re_HeroCards = re.compile(r"^Dealt to %(PLYR)s(?: \[(?P<OLDCARDS>.+?)\])?( \[(?P<NEWCARDS>.+?)\])" % short_subst, re.MULTILINE)
re_Action = re.compile(r"""
^%(PLYR)s:(?P<ATYPE>\sbets|\schecks|\sraises|\scalls|\sfolds|\sdiscards|\sstands\spat)
(\s(%(CUR)s)?(?P<BET>[.\d]+))?(\sto\s%(CUR)s(?P<BETTO>[.\d]+))? # the number discarded goes in <BET>
\s*(and\sis\sall.in)?
(and\shas\sreached\sthe\s[%(CUR)s\d\.]+\scap)?
(\scards?(\s\[(?P<DISCARDED>.+?)\])?)?\s*$"""
% subst, re.MULTILINE|re.VERBOSE)
self.re_ShowdownAction = re.compile(r"^%s: shows \[(?P<CARDS>.*)\]" % player_re, re.MULTILINE)
self.re_CollectPot = re.compile(r"Seat (?P<SEAT>[0-9]+): %(PLYR)s (\(button\) |\(small blind\) |\(big blind\) |\(button\) \(small blind\) |\(button\) \(big blind\) )?(collected|showed \[.*\] and won) \(%(CUR)s(?P<POT>[.\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<SEAT>[0-9]+): %s (\(.*\) )?(?P<SHOWED>showed|mucked) \[(?P<CARDS>.*)\].*" % player_re, re.MULTILINE)
% short_subst, re.MULTILINE|re.VERBOSE)
re_ShowdownAction = re.compile(r"^%s: shows \[(?P<CARDS>.*)\]" % short_subst['PLYR'], re.MULTILINE)
re_sitsOut = re.compile("^%s sits out" % short_subst['PLYR'], re.MULTILINE)
re_ShownCards = re.compile("^Seat (?P<SEAT>[0-9]+): %s (\(.*\) )?(?P<SHOWED>showed|mucked) \[(?P<CARDS>.*)\].*" % short_subst['PLYR'], re.MULTILINE)
re_CollectPot = re.compile(r"Seat (?P<SEAT>[0-9]+): %(PLYR)s (\(button\) |\(small blind\) |\(big blind\) |\(button\) \(small blind\) |\(button\) \(big blind\) )?(collected|showed \[.*\] and won) \(%(CUR)s(?P<POT>[.\d]+)\)(, mucked| with.*|)" % short_subst, re.MULTILINE)
def compilePlayerRegexs(self, hand):
pass
def readSupportedGames(self):
return [["ring", "hold", "nl"],

View File

@ -20,7 +20,7 @@
import L10n
_ = L10n.get_translation()
from decimal import Decimal
from decimal_wrapper import Decimal
import datetime
from Exceptions import FpdbParseError

View File

@ -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()

View File

@ -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

View File

@ -18,7 +18,7 @@
import L10n
_ = L10n.get_translation()
from decimal import Decimal
from decimal_wrapper import Decimal
import datetime
from BeautifulSoup import BeautifulSoup

View File

@ -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

View File

@ -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):

View File

@ -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 <erkiferenc@gmail.com>\n"
"Language-Team: Hungarian <erkiferenc@gmail.com>\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"