update for a previous update (putting conf.dataEncoding in getUnicode wherever we know that data won't be 'touched' or 'used' in anyway related to the current web page - if not sure, just leave it as it is)

This commit is contained in:
Miroslav Stampar
2011-01-03 22:31:29 +00:00
parent 08ccbf2c1e
commit 0eabca9fd4
9 changed files with 12 additions and 14 deletions

View File

@@ -45,7 +45,7 @@ def direct(query, content=True):
output = timeout(func=conf.dbmsConnector.select, args=(query,), duration=conf.timeout, default=None)
infoMsg = "resumed from file '%s': " % conf.sessionFile
infoMsg += "%s..." % getUnicode(output)[:20]
infoMsg += "%s..." % getUnicode(output, conf.dataEncoding)[:20]
logger.info(infoMsg)
else:
output = timeout(func=conf.dbmsConnector.select, args=(query,), duration=conf.timeout, default=None)
@@ -61,7 +61,7 @@ def direct(query, content=True):
out = list(output)[0][0]
if isinstance(out, str):
out = utf8decode(out)
return getUnicode(out)
return getUnicode(out, conf.dataEncoding)
else:
return list(output)
else: