quick fixes

This commit is contained in:
Miroslav Stampar 2010-05-21 12:25:49 +00:00
parent 78547bb79e
commit 219628aa01

View File

@ -30,6 +30,7 @@ from lib.core.agent import agent
from lib.core.common import dataToSessionFile from lib.core.common import dataToSessionFile
from lib.core.common import dataToStdout from lib.core.common import dataToStdout
from lib.core.common import getCharset from lib.core.common import getCharset
from lib.core.common import getGoodSamaritanCharsets
from lib.core.common import replaceNewlineTabs from lib.core.common import replaceNewlineTabs
from lib.core.common import safeStringFormat from lib.core.common import safeStringFormat
from lib.core.convert import urlencode from lib.core.convert import urlencode
@ -342,10 +343,10 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
charStart = time.time() charStart = time.time()
if conf.useCommonPrediction: if conf.useCommonPrediction:
commonTbl, otherTbl = getCommonPredictionTables(finalValue, asciiTbl) predictedCharset, otherCharset = getGoodSamaritanCharsets(finalValue, asciiTbl)
val = getChar(index, commonTbl) if commonTbl else None val = getChar(index, predictedCharset) if predictedCharset else None
if not val: if not val:
val = getChar(index, otherTbl) val = getChar(index, otherCharset)
else: else:
val = getChar(index, asciiTbl) val = getChar(index, asciiTbl)