From a6024e2859af019dc77f1b6331ebef0507dce344 Mon Sep 17 00:00:00 2001 From: Scott Wolchok Date: Sun, 27 Feb 2011 17:33:05 -0500 Subject: [PATCH 01/10] enable WAL in sqlite --- pyfpdb/Database.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index 6694b562..b2a4347c 100644 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -464,6 +464,7 @@ class Database: log.warning(_("Some database functions will not work without NumPy support")) self.cursor = self.connection.cursor() self.cursor.execute('PRAGMA temp_store=2') # use memory for temp tables/indexes + self.cursor.execute('PRAGMA journal_mode=WAL') # use memory for temp tables/indexes self.cursor.execute('PRAGMA synchronous=0') # don't wait for file writes to finish else: raise FpdbError("sqlite database "+database+" does not exist") From 20243ac6ed8d365f905a374fc516e419d1cfeb8c Mon Sep 17 00:00:00 2001 From: Eratosthenes Date: Tue, 1 Mar 2011 12:22:48 -0500 Subject: [PATCH 02/10] Fix problem with missing tables or unfound tables. --- pyfpdb/HUD_main.pyw | 2 +- pyfpdb/TableWindow.py | 6 +++++- pyfpdb/XTables.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pyfpdb/HUD_main.pyw b/pyfpdb/HUD_main.pyw index 04476dae..e4d86670 100755 --- a/pyfpdb/HUD_main.pyw +++ b/pyfpdb/HUD_main.pyw @@ -266,7 +266,7 @@ class HUD_main(object): cards = self.get_cards(new_hand_id) table_kwargs = dict(table_name=table_name, tournament=tour_number, table_number=tab_number) tablewindow = Tables.Table(self.config, site_name, **table_kwargs) - if tablewindow is None: + if tablewindow.number is None: # If no client window is found on the screen, complain and continue if type == "tour": table_name = "%s %s" % (tour_number, tab_number) diff --git a/pyfpdb/TableWindow.py b/pyfpdb/TableWindow.py index 72151d13..5d69687f 100644 --- a/pyfpdb/TableWindow.py +++ b/pyfpdb/TableWindow.py @@ -34,9 +34,13 @@ import gtk import gobject # FreePokerTools modules +import Configuration from HandHistoryConverter import getTableTitleRe from HandHistoryConverter import getTableNoRe +c = Configuration.Config() +log = Configuration.get_logger("logging.conf", "hud", log_dir=c.dir_log, log_file='HUD-log.txt') + # Global used for figuring out the current game being played from the title. # The dict key is a tuple of (limit type, category) for the game. # The list is the names for those games used by the supported poker sites @@ -142,7 +146,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() diff --git a/pyfpdb/XTables.py b/pyfpdb/XTables.py index 10278a05..93664856 100644 --- a/pyfpdb/XTables.py +++ b/pyfpdb/XTables.py @@ -128,7 +128,7 @@ class Table(Table_Window): des_re = 'No such window with id' listing = os.popen("xwininfo -id %d -stats" % (self.number)).read() - + if listing == "": return mo = re.search(des_re, listing) if mo is not None: return None # table has been destroyed From 9a7d148cf218f76ba7bf9cf61ebf73e79ce3b878 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Tue, 1 Mar 2011 22:44:13 +0100 Subject: [PATCH 03/10] allow . in ongame table names --- pyfpdb/OnGameToFpdb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/OnGameToFpdb.py b/pyfpdb/OnGameToFpdb.py index a7423c00..15bb1a35 100755 --- a/pyfpdb/OnGameToFpdb.py +++ b/pyfpdb/OnGameToFpdb.py @@ -73,7 +73,7 @@ class OnGame(HandHistoryConverter): re_HandInfo = re.compile(u""" \*\*\*\*\*\sHistory\sfor\shand\s(?P[-A-Z\d]+).* Start\shand:\s(?P.*) - Table:\s(\[SPEED\]\s)?(?P[-\'\w\s]+)\s\[\d+\]\s\( + Table:\s(\[SPEED\]\s)?(?P
[-\'\w\s\.]+)\s\[\d+\]\s\( ( (?PNO_LIMIT|Limit|LIMIT|Pot\sLimit|POT_LIMIT)\s (?PTEXAS_HOLDEM|OMAHA_HI|SEVEN_CARD_STUD|SEVEN_CARD_STUD_HI_LO|RAZZ|FIVE_CARD_DRAW)\s From 9fadd7b81c2a4aec561b4958f312ed0068f49bff Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Tue, 1 Mar 2011 22:50:44 +0100 Subject: [PATCH 04/10] minor update to l10n files --- pyfpdb/locale/de/LC_MESSAGES/fpdb.mo | Bin 20591 -> 20366 bytes pyfpdb/locale/es/LC_MESSAGES/fpdb.mo | Bin 11947 -> 11947 bytes pyfpdb/locale/fpdb-de_DE.po | 7 ++++--- pyfpdb/locale/fpdb-en_GB.pot | 4 ++-- pyfpdb/locale/fpdb-es_ES.po | 4 ++-- pyfpdb/locale/fpdb-fr_FR.po | 4 ++-- pyfpdb/locale/fpdb-hu_HU.po | 5 +++-- pyfpdb/locale/fr/LC_MESSAGES/fpdb.mo | Bin 29028 -> 29028 bytes pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo | Bin 76240 -> 76484 bytes 9 files changed, 13 insertions(+), 11 deletions(-) diff --git a/pyfpdb/locale/de/LC_MESSAGES/fpdb.mo b/pyfpdb/locale/de/LC_MESSAGES/fpdb.mo index 7f555b33e19c7fd431dc9077a4c1dab9c0d97182..aef2f47293bb467ea70504bfd977e8979e4283a0 100644 GIT binary patch delta 3687 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 delta 18 acmZ1-yE=Bm9Vu1=Q!7)$%@3tc2?GF0!3RtL diff --git a/pyfpdb/locale/fpdb-de_DE.po b/pyfpdb/locale/fpdb-de_DE.po index ad00171c..0f005f9c 100644 --- a/pyfpdb/locale/fpdb-de_DE.po +++ b/pyfpdb/locale/fpdb-de_DE.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.20.905 plus git\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: 2010-08-30 00:57+0200\n" "Last-Translator: Steffen Schaumburg \n" "Language-Team: Fpdb\n" @@ -3099,7 +3099,7 @@ msgstr "" #: fpdb.pyw:38 msgid " - press return to continue\n" -msgstr " - drücken Sie Enter um fortzufahren" +msgstr " - drücken Sie Enter um fortzufahren\n" #: fpdb.pyw:45 msgid "" @@ -3133,8 +3133,9 @@ msgid "GuiStove not found. If you want to use it please install pypoker-eval." msgstr "" #: fpdb.pyw:244 +#, fuzzy msgid "" -"Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " +"Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " "sqlcoder, Bostik, and others" msgstr "" "Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " diff --git a/pyfpdb/locale/fpdb-en_GB.pot b/pyfpdb/locale/fpdb-en_GB.pot index 38892076..6b69504c 100644 --- a/pyfpdb/locale/fpdb-en_GB.pot +++ b/pyfpdb/locale/fpdb-en_GB.pot @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2990,7 +2990,7 @@ msgid "GuiStove not found. If you want to use it please install pypoker-eval." msgstr "" #: fpdb.pyw:244 -msgid "Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, sqlcoder, Bostik, and others" +msgid "Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, sqlcoder, Bostik, and others" msgstr "" #: fpdb.pyw:245 diff --git a/pyfpdb/locale/fpdb-es_ES.po b/pyfpdb/locale/fpdb-es_ES.po index 3a83424a..23f94404 100644 --- a/pyfpdb/locale/fpdb-es_ES.po +++ b/pyfpdb/locale/fpdb-es_ES.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: fpdb\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: \n" "Last-Translator: Javier Sánchez \n" "Language-Team: \n" @@ -3042,7 +3042,7 @@ msgstr "" #: fpdb.pyw:244 msgid "" -"Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " +"Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " "sqlcoder, Bostik, and others" msgstr "" diff --git a/pyfpdb/locale/fpdb-fr_FR.po b/pyfpdb/locale/fpdb-fr_FR.po index b6b808c2..5ba22736 100644 --- a/pyfpdb/locale/fpdb-fr_FR.po +++ b/pyfpdb/locale/fpdb-fr_FR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: 2010-09-09 13:33+0100\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" @@ -3195,7 +3195,7 @@ msgstr "" #: fpdb.pyw:244 msgid "" -"Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " +"Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " "sqlcoder, Bostik, and others" msgstr "" diff --git a/pyfpdb/locale/fpdb-hu_HU.po b/pyfpdb/locale/fpdb-hu_HU.po index 5487262f..2d3f3aea 100644 --- a/pyfpdb/locale/fpdb-hu_HU.po +++ b/pyfpdb/locale/fpdb-hu_HU.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.20.905 plus git\n" -"POT-Creation-Date: 2011-02-27 05:51+CET\n" +"POT-Creation-Date: 2011-02-27 23:57+CET\n" "PO-Revision-Date: 2011-02-27 18:23+0100\n" "Last-Translator: Ferenc Erki \n" "Language-Team: Hungarian \n" @@ -3183,8 +3183,9 @@ msgstr "" "eval-t." #: fpdb.pyw:244 +#, fuzzy msgid "" -"Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " +"Copyright 2008-2011, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " "sqlcoder, Bostik, and others" msgstr "" "Copyright 2008-2010, Steffen, Eratosthenes, Carl Gherardi, Eric Blade, _mt, " diff --git a/pyfpdb/locale/fr/LC_MESSAGES/fpdb.mo b/pyfpdb/locale/fr/LC_MESSAGES/fpdb.mo index 2ca10d4f1bd814a68fac0846b35248156dd404e0..e75ed7d50a39b80c244380be9c3286770f39ad26 100644 GIT binary patch delta 20 bcmaFzi1EoI#tkNptVYIGrskV19kmSrU5*D# delta 20 bcmaFzi1EoI#tkNptOll5riPm>9kmSrU1$eJ diff --git a/pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo b/pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo index f60e6655ac71ddc2d07d0db119fa929d2cb14cff..80056f1201355a41c3d66bfdfc1d88672091e95a 100644 GIT binary patch delta 14385 zcmajld3aCPzQ^$$fOH~b>v^7(Q`~GCD=ef`Q>z?P{`&!?%_g=$y4L_WF>`U)`UwgY} zLcA9^{AWl-$BDwwNJanqAOBX46F?Y%ff$KRuo1>#KWv7s^?ghvK8O5|6P)5WVVH&b zZV1-IS=f`$oYfQ}sJM+aFr>BP)WL?>6tge}pTh3A2p_@A*c_8n&3E~z0Zm1H|1JjO zJ`Bfi(1TYn8iUdt$Cv({1PYpYYt(~2SQ|^wALn9KeA~vQ=tH~}t6&-W;-{#YoIO z_W2dm04jGd8Loxe#0^nPo6^BGA9SL^kBWY%7oNZdScK|eF=pd>tdDn49YtptldPSr z{ZM;g6l&npQJZrC7U4&z)6mTA=s0yL3_^7{9o6t!RO)wNS3HE;BjFF38O5RomWrBr zSJZa{(Su`A8Juk`MJ>^OROZg2_KKnWlQGQN2z9R8pJAC=O{sLaenHM|U!!YwvFhVjI|U`4F{uo+l5>brWV z0j6L&c0_$Y4ZU#@`qRI&j6xcgqGomhHITni$HqI0<-thQhtXIG>!B{5cpE39zE4GE ztTXyxZ&Z7OP!k)6`ffV9`rs7`jqy#?i1%O>JdDcB*VaqcJE-I1*Tq;9wK-$a2a{15 zXoK2pIXE6iU@V@pa*w;^DQWPC89)bY!3zag8&@KCjq?d=p#R1C=-bt-X#zGN9*XsF z2C{ve^~iy7{z45Pxtlpr5 zOvaO_r3-k}+-zB>b3Yu_(G=AC3s3{!fNJkJ>b+lG3TjwCZTg@lYORuOoQb+2b1@K~ zK`qTJ>wMH+Sc-M<9rWNH)OY7G5g%Z4Ow2JE8-|>G$DK(*Gd_%3yW6NW_v&Hp@am|w zY=+ga6KV#1P#GJGTB?PpfqaO;xYK$VClH@S4X{s7^D8?6{pjDBPeBc@z!2Po>R=xR z;SWfboj;ICIO)C2F?tofiC3dCQ;Gq&9hLHfn1E+c6AS2VG8cyY+&Izbt@A&K!fYyr zVG>@&>R7*z8CYvH46)dk%FWtwVLZ5yNpW`r~O- z1}>wknZ^w;$0HqIBOZ*c@po*6v5%R|JdV-CucHRK5m^;y4_3t*1I-e6P)m}49k4C> z;xyFvFQe{(wFAk&QhS(+TKEq(!?4HAd4Jg23-x>mM&J}&&*INVt^}t;uF1@+s9n7g zwHg0L?i%M7HpYx$TuL|wTVUxh@~;lhQlU*!?Fq99BTyr5f|aoqhGAROChKkEVHiw2 z8TH<)sPE?DP+W?6_+QM#Cx)8=m!kT+;Zk5C&VB5N6?t1D%fvK%8ntFyPz~?Jx_B5h zqrXt6Br4wwtO5_5#+o& zIjBAJxP3kjwYg?tJid#1?+9vQr*IUW#qxGWm|w#jWY4(HEDCyYAu6>?QFneR#^Pnv z9tj+2Qq~65P-pbTuC~4ps^h_!j-yb!d<_o43#iT7nbD-+B8=1dKSn_*yp7tmKBLV{ z!m$x?2I_eMG6`oY`r^;1rMZHS;6JGMG7HRU=!?p1E=J)L?1T$Z1N$Byrhg}L44vQ; z*bP@>1-y#t=mx%r4=@1V8*6T|U8qd#!x;SB*8h(F#MiA}g=Rp37)X5tYQPQAtxTbq zg4T2j2I1@IgUeAJtVO-I5&iH3tcqo*&2|VifitL%J>$$p)D*Lbd!uH&3@hUIsP=yx zNB*_;zfhruuAt7h*LZW@BT<=Xg-T&6HpIRdi7x6&U4lBE+ff-hhE?zk2IEE4Zoh5g z@FMf87+*yGtMOm}73yFV>Vp|r2Nz>g+>Swb3G3l4)IcMP%^J5veg7zGV56}*&cG(P z1eN+vF%G{)UCj?%3OYVDO3VjMQ5nfVZeJ%8HGmbU({Kbc@j6b$^ag*Tm|mHEe=W*b$YPA*dyI9+k-js8jTobp@)OHCR>W|34Js@gvkGxrEBdO;iV= z&zQArglf1g*2V6qhKo>3FbVbjbgYfDF$_1N2C@(J{b#5pIgPGT8!*jWG#yZT;Sp4W z*{GEDL3K13)zEO%8jrN~W3c=lLEQ^eusXhoYG*Nq;7ZhH{J^?z8u`}@zoJ6t_E*&I zzKvRv_M}Gx7=U`NpKCQZ4mHzB7>+Yg9lnj4;bt4}M=jk+8(*}~@1h3cKb?X`9yQ&} ztRCuvhN$|Mn2v3*4o*TnUxaF4H8#T!u{K^r9aHaT&G(H^n>h)U!F<$r1=t;@x)ikb zU!ZpLO;idKo--Y#qCUt({TB4K^+Qn^8DpP6jr#6Y`}|ECud>hILuKe=48;=|h3+K^ znvwVOrlVj~N@FkvQ&AlcL@h-gHo&pSfp8WeC(j9f!EClyaT4)6sP7_QG=JcT#c1M8 zWM4aZSW)NyCkh(CMbsv_hFbf|FPYx}5B4NZM;)8jQK^0lwHLOb_Cguf!lPKemoSa^ zHmd#P8RoqXsEl?;{ri(MghB@@mZR44ENYimd)a(g11l5P#ZDNHO>r!0ZI@yp9!Cv4 zW2VW_K#U`P&RU8d;uBa8uVEJbJK?XG)C|Q|#4aY_7S#E@fXd80)TRk~m7|D5P;2=y zR>3c^KAuK(;LI`|)<+-0&Zs@`DCzq9?0sMq& zu=(rexTRxN;%r=t{ZZ}euT{#3$C`$L#J!QVcb=F{{);I*Nku%KM%@RM=CIQ-5?f*s zYDxZu8t6v!$35taM^OVhi9z@iDkE1>_rYDPg#K@s`VjOZuJs1_*QRMeg;Je?0oWh) zK|U&F1vZ|J>gXlZOlI5q<*0$Zi)wf~HpTs@_pf0yyobt6)43)C*)9d8t_Ny{kE7Nw z7d3;IPz}G1iMYzve~CJ#r%@eUL!IZCc_!uUFp0Q7YGSWoU0jKp;6BuGbWc#wX89X6 zqZ;$g64b{8;xw#|Be5MmgBsv2)RLV;U0i+(%yD}NGl-|5IxIs?@I2}!y@Hx(qc_V3 z=sJlMv;?_W1E->9HWx#%6t&hLq2Bu(mEsFF{u>(*`!6&ZNJeeC9Ms+zh1wG(sPA9E zID8v}b^Z@h@KA9QTjE`7vqh%id{nAlLuFzEDurdJj*eh!yo{+Bv)HWlKvexK^x%G+ zh!;^A8vGU+rhjJz1 Dg$RR6>p#i6PK7J%E4gb5{$%`Py>1gHNY*{5x+*YQ*)^~ z=Lx7Kdl)tI0&IcvvHaivKck>jpF<7gIx6Mf%go<^f>Eh#gH13K)j=_Oa3*TNrKk-4 zY^}B2WGV;4sUM7C_!QQ}*Ort22nuU#MVa-a^(yMP_`Pj@RvTj|aSzm$oR8IT3~E5r zP@8!^YV&SGb#w_Ep|ipaq%lSjKD5F$e~lhWh0f_LjKKxi4!5G#@Fr@8i7U-+ABoy@ zD^VSMiZi{)AZkLRSD7Vx5u58hROY_I6!d!6{N|*(6f&rof_iZm*1|tgYgBc$8Blv1 zMx2Z4U>|Dj&tQGLifI_W#!RRuP9UC!1$Z6PF?X%`eiVAsmVr7Xb7s^7qK4wJ8LP_q2ds# zqu;ERH<;ZWgKD@VYLn$#r=oWAT-5GfhdMpGQ5iap{&)p-U;Kl5?z_?S6M@0>@3gQL znWz-!q6a6S*7i+oh&!!6qpsF~_sk}2hK-2(S)W4dazsD>AymZ%IH<5|>ue(#%s#bZB;QHo&{6%*AXnrdYE# zk$-*g1QkIz$v$`)HRI)2ga=WlA?-hA*A}7%xC)iA!>D%7;Sjuu0oZr5S)$=sjreKQ z`?GBQ3jIYvn_?>!n%NH+hrS<}HBUkfq!0SyGz`I)txK%$p^ouxtcn#sGzMBDto5yl z)-=}^I$LwB1FiYi@z$x<8CaQ)=Avf07&Wl9sHNP2mGEl}#M7vO{fd5g1GR*%*B0}m zQ3pFvF${G>twLqwG-?x7*=kZ)4}*zYpgPRNFdTq7CF4*ToR9i`m-R9x5QlCvzyA** zOX50N6x84V)Cfmo7CwbKr=OrVoYRbp97ps7b{-`@$X@A4JXUM^wkRQ0KYQ4m!aQ)BuKC$6+|}R8$A^u@Ho@jthOO`#D#eX4WU8sGt3gm+L& zHn+@dt`AU|J%RfEH_XB2yUiYXemD8ojMh_82ajST{)tV{Z;!cnTBGXwq0W6V*2QJ0 zl$Y7~JB%Uz2diW4z2;s?LJd3vt6(ow`vdp7=KQ}*g&KMfmBItq9=-ONlxJXX;yl#u z-hn>&6KXAgLp690HRJgGX76;w2E+qU8Jlk1gc`_CE(L9tUr__NgR?RCfLVf-)-O>V zRyt^A7Kqw2by1mVgPLJ~%*RnU0*_-frhRJeg8`@k4nZAXcap7m6%(m=7qxl5LN)j+ zYV+Jf-GEu2F?;NZZ86|;a|*hm-tULWI1*>#GHi))hfJmiVJG6}@iCqMPbp|O*89Sw zb`a{=y@<7ODTd+>Y>Y>-1^$D2ui0VqN41Bs3-L=BkH@ez-bJ;ae8gOIV=#mGeQc@o zf0cqa6%CJ?j+$CKTKi!yo)=(KEW;$cf|Jp6%w*^-9722%2Vv%M)A75g%$&g-{0oCH z;{@5Gf2RiprF;l>#0gjxx1o0PUewGlU=jv@X$JBTCK8Xw09=X6$iGn?9|T zPi6+`)+|h=z7J}NW}{BWZe+=wo2Yi~p_aJHc~c*RKE!Sf3Y{rLV_zJO6LBYY#pIvO zu6D5=@mbWGSG-^@k}zyToQRrH0ctO-#$x;smGbzDroI*SAkIWG?K+Dn1X8g9)xl0| zfM;EC&sLMvQ_TI*A&6t()@{3FrJ=u12cz41*{#+G0LmSPm1#EN(mo8Vp4UWog{Y}Ut7 zGoOPV{19F3#&0N8#p|dUJ-|4udByz9c0jH16R0Ixf!cKYunykGrWpOFS(0w33vE7X zVx_2l&S5M*K%J`CzsSED>id^DCUdYk@p|;fGdBJWHN)t?jp?X?_D5xAJWjx;QK|hK z)p6QY^Rqo3=MW#jMC^Bse+9)E*T}y%$v0HUUojBxV+aOZH@nt@6^NTzlQD_76>0z@ zFcgbW8JdCJa6Pub+ZcvTZ~Ht7yj1N$)o?_ymHy=QiJ3Mzgawdq{cz?Y%g`x4duN%YtGzd%82c@;yk{(sF{ zrD84O98AU0sE${o26_s$C(ffXbG|ecG~*t4@`!dpfZz!Iz>HDduT9fljo!Efhp+foWD&$sXd6A z*$E88)7Gn~)8OlPl{XlLnn^rrz=^01T45J#hcWmvR>M-%_d8KbaRk+`x0jb&zFV7k zd6jqE4~Oz#C~7n9MrGhQX5o+64&y6$m0w6BP;0pw18@^+hM(B@OY1r7pZ58GQ3DFD z=$aYTuV^|-LZz+)*2c%IlTayp6E(1%sJ(FrHPegO5PiH&dr8)I*ns-3I2DVqKmLj8 zC(Etm<;TEB zd=vGZ<6|b|R;Qp{-x{@c*{B&VM5TVMjkjQL;sZDkBYnNfuj+}Yft8}Z+k{$@-8cvj zV`pq!)vNrT8INxge}ZI?fB*CIDnDN1QJZ5uw#ReW1Y`Wo3?D@`ScnOD7(3xTY=s#C zUga0fB-G|zh{NzbT!6uWUgh_~TGT*4NB#ewI;SXPP!StsI(`y$A+1HN@pkm!SEvEq zKxM3MHS;_LHK3k24WGr$=mdL}{~`4Q)aeQgG2ca?GMj*9^zXE#pdXFxzB z=z{vN1ijHk?Uff$YaJeHW}1qH#5tIbWvFw14>eHV8fMQ#qn4%#YROuotBa()eb5KB zIdW0wxdgS@rlKt8sI?!89dIIQ0NYSE>V9mCXRtm- z)#Uu^$0DPq*#pB-BU^*oj2~kiypH-HG{TsQn)zTs2Nv`_A39gTR3JCXJPrwF`oEa z)OTKW%<1r;E}(SOUh9WivN4#g^Iu9Kjf&gY5tBXUxIKl%#0&8u^oucT+8woL=Abh1 zHY$T3VFCu$HTOYV)bkQl>gS@C_5;*}zrema|2OOl-RhYa$D-DB4(i2?*a^QuH5ggn zn2JhyKWhPMBF~~W=PuMtKSgDrQmi@VF{q4o#%!Jc85FwW*QlE*rh)k&33VT2V=R`~ z_$?dnwq8Qr9|3V@0!gT)=!Lq#oAiWwC;h8=jow`8*vJ~LoyVhjV?4zpN9Pso-BnQH$^Adm@C?f< z*}J8nWbeA-Jf_rj@4BLbywRSLyn?)OdpDL84`+H~^TwwA|8sJ>lqYHL$^u4M9&Da` u;h7e7GRF-cmXljloL4>?x{r%3j`QU2T{)^?EHBUddw%HFn-N~8g8l~^@r9rO delta 14218 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 BN-+Qc From 271a9d0eeb13cf0f4a7ea506b0d12b00232ee192 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Tue, 1 Mar 2011 22:53:56 +0100 Subject: [PATCH 05/10] remove duplicate statement --- pyfpdb/Filters.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pyfpdb/Filters.py b/pyfpdb/Filters.py index f19774c7..182f8c58 100644 --- a/pyfpdb/Filters.py +++ b/pyfpdb/Filters.py @@ -160,7 +160,6 @@ class Filters(threading.Thread): self.types = {} # list of all ring/tour values self.num_limit_types = 0 - self.num_limit_types = 0 self.fillLimitsFrame(vbox, self.display) limitsFrame.add(vbox) From 320c856d9eb55dc3e027951d4fded3f309f0f6f3 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Tue, 1 Mar 2011 22:58:23 +0100 Subject: [PATCH 06/10] l10nify a string --- pyfpdb/TableWindow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/TableWindow.py b/pyfpdb/TableWindow.py index 5d69687f..c09ad40f 100644 --- a/pyfpdb/TableWindow.py +++ b/pyfpdb/TableWindow.py @@ -146,7 +146,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 710fd8dde2e874590e37bd4f0b1adefdea691a40 Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Wed, 2 Mar 2011 02:55:52 +0100 Subject: [PATCH 07/10] a couple of string corrections --- pyfpdb/Configuration.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index 365f7c4a..e0e945fb 100644 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -163,8 +163,8 @@ def get_logger(file_name, config = "config", fallback = False, log_dir=None, log log = logging.basicConfig(filename=file, level=logging.INFO) log = logging.getLogger() # but it looks like default is no output :-( maybe because all the calls name a module? - log.debug(_("Default logger initialised for ")+file) - print _("Default logger intialised for ")+file + log.debug(_("Default logger initialised for %s") % file) + print(_("Default logger initialised for %s") % file) return log def check_dir(path, create = True): From 90e26bc7c24ec048129621cedea3bbadf9049b8d Mon Sep 17 00:00:00 2001 From: Worros Date: Wed, 2 Mar 2011 10:11:35 +0800 Subject: [PATCH 08/10] Party: Possible fix for freeroll tourneys --- pyfpdb/PartyPokerToFpdb.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pyfpdb/PartyPokerToFpdb.py b/pyfpdb/PartyPokerToFpdb.py index 65b6f0aa..2abd744c 100755 --- a/pyfpdb/PartyPokerToFpdb.py +++ b/pyfpdb/PartyPokerToFpdb.py @@ -330,6 +330,12 @@ class PartyPoker(HandHistoryConverter): # FIXME: there is no such property in Hand class self.isSNG = True if key == 'BUYIN': + if info[key] == None: + # Freeroll tourney + hand.buyin = 0 + hand.fee = 0 + hand.buyinCurrency = "FREE" + hand.isKO = False if hand.tourNo != None: hand.buyin = 0 hand.fee = 0 From e88fb251380cd06dfaac9236cbd4b5a051009c1a Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Wed, 2 Mar 2011 03:15:15 +0100 Subject: [PATCH 09/10] string change --- pyfpdb/Configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyfpdb/Configuration.py b/pyfpdb/Configuration.py index e0e945fb..e350b49b 100644 --- a/pyfpdb/Configuration.py +++ b/pyfpdb/Configuration.py @@ -834,7 +834,7 @@ class Config: try: example_doc = xml.dom.minidom.parse(example_file) except: - log.error(_("Error parsing example file %s. See error log file.") % (example_file)) + log.error(_("Error parsing example configuration file %s. See error log file.") % (example_file)) return nodes_added for cnode in doc.getElementsByTagName("FreePokerToolsConfig"): From c03d050337fd7195ba089aca3441e310491db7fc Mon Sep 17 00:00:00 2001 From: Steffen Schaumburg Date: Wed, 2 Mar 2011 07:03:09 +0100 Subject: [PATCH 10/10] string consistency fixes --- pyfpdb/Database.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pyfpdb/Database.py b/pyfpdb/Database.py index b2a4347c..9812300b 100644 --- a/pyfpdb/Database.py +++ b/pyfpdb/Database.py @@ -1169,7 +1169,7 @@ class Database: for idx in self.indexes[self.backend]: if idx['drop'] == 1: if self.backend == self.MYSQL_INNODB: - print _("Creating mysql index %s %s") % (idx['tab'], idx['col']) + print _("Creating MySQL index %s %s") % (idx['tab'], idx['col']) try: s = "alter table %s add index %s(%s)" % (idx['tab'],idx['col'],idx['col']) c.execute(s) @@ -1178,7 +1178,7 @@ class Database: elif self.backend == self.PGSQL: # pass # mod to use tab_col for index name? - print _("Creating pg index "), idx['tab'], idx['col'] + print _("Creating PostgreSQL index "), idx['tab'], idx['col'] try: s = "create index %s_%s_idx on %s(%s)" % (idx['tab'], idx['col'], idx['tab'], idx['col']) c.execute(s) @@ -1423,22 +1423,22 @@ class Database: if cons: pass else: - print _("creating foreign key "), fk['fktab'], fk['fkcol'], "->", fk['rtab'], fk['rcol'] + print _("Creating foreign key "), fk['fktab'], fk['fkcol'], "->", fk['rtab'], fk['rcol'] try: c.execute("alter table " + fk['fktab'] + " add foreign key (" + fk['fkcol'] + ") references " + fk['rtab'] + "(" + fk['rcol'] + ")") except: - print _(" create foreign key failed: ") + str(sys.exc_info()) + print _("Create foreign key failed: ") + str(sys.exc_info()) elif self.backend == self.PGSQL: - print _("creating foreign key "), fk['fktab'], fk['fkcol'], "->", fk['rtab'], fk['rcol'] + print _("Creating foreign key "), fk['fktab'], fk['fkcol'], "->", fk['rtab'], fk['rcol'] try: c.execute("alter table " + fk['fktab'] + " add constraint " + fk['fktab'] + '_' + fk['fkcol'] + '_fkey' + " foreign key (" + fk['fkcol'] + ") references " + fk['rtab'] + "(" + fk['rcol'] + ")") except: - print _(" create foreign key failed: ") + str(sys.exc_info()) + print _("Create foreign key failed: ") + str(sys.exc_info()) else: print _("Only MySQL and Postgres supported so far")