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

Remove NEWIMPORT variable.

Browse Source 
No going back now :)
This commit is contained in:
Worros 2010-01-23 13:37:41 +08:00
parent 98e4b598ed
commit 29e705f337
4 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pyfpdb/Configuration.py
View File

@ -126,7 +126,6 @@ DATABASE_TYPES = (
DATABASE_TYPE_MYSQL, DATABASE_TYPE_MYSQL,
) )
NEWIMPORT = True
LOCALE_ENCODING = locale.getdefaultlocale()[1] LOCALE_ENCODING = locale.getdefaultlocale()[1]
######################################################################## ########################################################################

3
pyfpdb/HandHistoryConverter.py
View File

@ -292,8 +292,7 @@ which it expects to find at self.re_TailSplitHands -- see for e.g. Everleaf.py.
log.info("Unsupported game type: %s" % gametype) log.info("Unsupported game type: %s" % gametype)
if hand: if hand:
if Configuration.NEWIMPORT == False: #hand.writeHand(self.out_fh)
hand.writeHand(self.out_fh)
return hand return hand
else: else:
log.info("Unsupported game type: %s" % gametype) log.info("Unsupported game type: %s" % gametype)

4
pyfpdb/fpdb_import.py
View File

@ -98,8 +98,6 @@ class Importer:
for i in xrange(self.settings['threads']): for i in xrange(self.settings['threads']):
self.writerdbs.append( Database.Database(self.config, sql = self.sql) ) self.writerdbs.append( Database.Database(self.config, sql = self.sql) )
self.NEWIMPORT = Configuration.NEWIMPORT
clock() # init clock in windows clock() # init clock in windows
#Set functions #Set functions
@ -433,7 +431,7 @@ class Importer:
else: else:
self.pos_in_file[file] = 0 self.pos_in_file[file] = 0
hhc = obj(in_path = file, out_path = out_path, index = idx, starsArchive = self.settings['starsArchive']) hhc = obj(in_path = file, out_path = out_path, index = idx, starsArchive = self.settings['starsArchive'])
if hhc.getStatus() and self.NEWIMPORT == True: if hhc.getStatus():
handlist = hhc.getProcessedHands() handlist = hhc.getProcessedHands()
self.pos_in_file[file] = hhc.getLastCharacterRead() self.pos_in_file[file] = hhc.getLastCharacterRead()
to_hud = [] to_hud = []

6
pyfpdb/test_PokerStars.py
View File

@ -178,11 +178,7 @@ def testDrawImport():
(stored, dups, partial, errs, ttime) = importer.runImport() (stored, dups, partial, errs, ttime) = importer.runImport()
importer.clearFileList() importer.clearFileList()
except FpdbError: except FpdbError:
if Configuration.NEWIMPORT == False: assert 0 == 1
#Old import code doesn't support draw
pass
else:
assert 0 == 1
# Should actually do some testing here # Should actually do some testing here
assert 1 == 1 assert 1 == 1