evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed redundant db variable

Browse Source
This commit is contained in:
sqlcoder 2009-05-02 21:07:52 +01:00
parent 7d28f70a98
commit 882f19a34d
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pyfpdb/GuiBulkImport.py
View File

@ -30,7 +30,6 @@ import gtk
# fpdb/FreePokerTools modules # fpdb/FreePokerTools modules
import fpdb_simple import fpdb_simple
import fpdb_import import fpdb_import
import fpdb_db
import Configuration import Configuration
class GuiBulkImport(): class GuiBulkImport():
@ -83,8 +82,7 @@ class GuiBulkImport():
"""returns the vbox of this thread""" """returns the vbox of this thread"""
return self.vbox return self.vbox
def __init__(self, db, settings, config): def __init__(self, settings, config):
self.db = db # this is an instance of fpdb_db
self.settings = settings self.settings = settings
self.config = config self.config = config
self.importer = fpdb_import.Importer(self, self.settings, self.importer = fpdb_import.Importer(self, self.settings,
@ -227,7 +225,6 @@ def main(argv=None):
(options, sys.argv) = parser.parse_args(args = argv) (options, sys.argv) = parser.parse_args(args = argv)
config = Configuration.Config() config = Configuration.Config()
db = None
settings = {} settings = {}
settings['minPrint'] = options.minPrint settings['minPrint'] = options.minPrint
@ -243,7 +240,7 @@ def main(argv=None):
print '-q is deprecated. Just use "-f filename" instead' print '-q is deprecated. Just use "-f filename" instead'
# This is because -q on its own causes an error, so -f is necessary and sufficient for cmd line use # This is because -q on its own causes an error, so -f is necessary and sufficient for cmd line use
if not options.filename: if not options.filename:
i = GuiBulkImport(db, settings, config) i = GuiBulkImport(settings, config)
main_window = gtk.Window() main_window = gtk.Window()
main_window.connect('destroy', destroy) main_window.connect('destroy', destroy)
main_window.add(i.vbox) main_window.add(i.vbox)

2
pyfpdb/fpdb.py
View File

@ -324,7 +324,7 @@ class fpdb:
def tab_bulk_import(self, widget, data): def tab_bulk_import(self, widget, data):
"""opens a tab for bulk importing""" """opens a tab for bulk importing"""
#print "start of tab_bulk_import" #print "start of tab_bulk_import"
new_import_thread=GuiBulkImport.GuiBulkImport(self.db, self.settings, self.config) new_import_thread=GuiBulkImport.GuiBulkImport(self.settings, self.config)
self.threads.append(new_import_thread) self.threads.append(new_import_thread)
bulk_tab=new_import_thread.get_vbox() bulk_tab=new_import_thread.get_vbox()
self.add_and_display_tab(bulk_tab, "Bulk Import") self.add_and_display_tab(bulk_tab, "Bulk Import")