Revert "Modified hhc & fpdb_import so gtk & pygtk are imported only if import is run from the"

This reverts commit 64f46181fa.
This commit is contained in:
Worros
2011-03-22 15:20:50 +08:00
parent 94dc683281
commit 867c547ca0
2 changed files with 9 additions and 8 deletions
+3 -2
View File
@@ -35,6 +35,9 @@ import logging
# logging has been set up in fpdb.py or HUD_main.py, use their settings:
log = logging.getLogger("importer")
import pygtk
import gtk
# fpdb/FreePokerTools modules
import Database
import Configuration
@@ -258,7 +261,6 @@ class Importer:
pass
else:
print _("waiting for writers to finish ...")
import gtk, pygtk
#for t in threading.enumerate():
# print " "+str(t)
#self.writeq.join()
@@ -455,7 +457,6 @@ class Importer:
self.pos_in_file[file] = 0
hhc = obj( self.config, in_path = file, index = idx, starsArchive = self.settings['starsArchive'], ftpArchive = self.settings['ftpArchive'], sitename = site )
if hhc.getStatus():
if self.caller: hhc.progressNotify()
handlist = hhc.getProcessedHands()
self.pos_in_file[file] = hhc.getLastCharacterRead()
to_hud = []