Remove NEWIMPORT variable.

No going back now :)
This commit is contained in:
Worros 2010-01-23 13:37:41 +08:00 committed by Gerko de Roo
parent c36c60155c
commit dbaad2d430
4 changed files with 3 additions and 11 deletions

View File

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

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)
if hand:
if Configuration.NEWIMPORT == False:
hand.writeHand(self.out_fh)
#hand.writeHand(self.out_fh)
return hand
else:
log.info("Unsupported game type: %s" % gametype)

View File

@ -98,8 +98,6 @@ class Importer:
for i in xrange(self.settings['threads']):
self.writerdbs.append( Database.Database(self.config, sql = self.sql) )
self.NEWIMPORT = Configuration.NEWIMPORT
clock() # init clock in windows
#Set functions
@ -433,7 +431,7 @@ class Importer:
else:
self.pos_in_file[file] = 0
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()
self.pos_in_file[file] = hhc.getLastCharacterRead()
to_hud = []

View File

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