reverting some changes

This commit is contained in:
Miroslav Stampar 2011-01-11 12:11:33 +00:00
parent 54e0ba935a
commit 394b6bc029
2 changed files with 2 additions and 5 deletions

View File

@ -427,7 +427,7 @@ def dataToStdout(data, forceOutput=False):
try: try:
sys.stdout.write(data) sys.stdout.write(data)
except UnicodeEncodeError: except UnicodeEncodeError:
sys.stdout.write(data.encode(conf.dataEncoding)) sys.stdout.write(data.encode(kb.pageEncoding or conf.dataEncoding))
finally: finally:
sys.stdout.flush() sys.stdout.flush()

View File

@ -1183,10 +1183,7 @@ def __setKnowledgeBaseAttributes(flushAll=True):
kb.osVersion = None kb.osVersion = None
kb.osSP = None kb.osSP = None
# Default page encoding for HTML documents kb.pageEncoding = None
# Reference: http://en.wikipedia.org/wiki/ISO/IEC_8859-1
kb.pageEncoding = 'iso-8859-1'
kb.pageStable = None kb.pageStable = None
kb.partRun = None kb.partRun = None
kb.proxyAuthHeader = None kb.proxyAuthHeader = None