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

Conflicts:
	pyfpdb/Hud.py

git is really pissing me off
This commit is contained in:
eblade 2009-03-05 18:38:10 -05:00
commit fc855995c7
2 changed files with 9 additions and 9 deletions

View File

@ -31,8 +31,8 @@ Main for FreePokerTools HUD.
import sys
# redirect the stderr
#errorfile = open('HUD-error.txt', 'w', 0)
#sys.stderr = errorfile
errorfile = open('HUD-error.txt', 'w', 0)
sys.stderr = errorfile
import os
import thread

View File

@ -85,13 +85,13 @@ class Hud:
# do we need to add some sort of condition here for dealing with a request for a font that doesn't exist?
game_params = config.get_game_parameters(self.poker_game)
# if not game_params['aux'] == "":
# for aux in game_params['aux']:
# aux_params = config.get_aux_parameters(aux)
# my_import = importName(aux_params['module'], aux_params['class'])
# if my_import == None:
# continue
# self.aux_windows.append(my_import(self, config, aux_params))
if not game_params['aux'] == "":
for aux in game_params['aux']:
aux_params = config.get_aux_parameters(aux)
my_import = importName(aux_params['module'], aux_params['class'])
if my_import == None:
continue
self.aux_windows.append(my_import(self, config, aux_params))
def create_mw(self):