From 394b6bc02983b2ec8cb4c7a72d050dc5c014317f Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 11 Jan 2011 12:11:33 +0000 Subject: [PATCH] reverting some changes --- lib/core/common.py | 2 +- lib/core/option.py | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index 676adff6e..5e7d645cd 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -427,7 +427,7 @@ def dataToStdout(data, forceOutput=False): try: sys.stdout.write(data) except UnicodeEncodeError: - sys.stdout.write(data.encode(conf.dataEncoding)) + sys.stdout.write(data.encode(kb.pageEncoding or conf.dataEncoding)) finally: sys.stdout.flush() diff --git a/lib/core/option.py b/lib/core/option.py index 50a191903..3812cc5e7 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -1183,10 +1183,7 @@ def __setKnowledgeBaseAttributes(flushAll=True): kb.osVersion = None kb.osSP = None - # Default page encoding for HTML documents - # Reference: http://en.wikipedia.org/wiki/ISO/IEC_8859-1 - kb.pageEncoding = 'iso-8859-1' - + kb.pageEncoding = None kb.pageStable = None kb.partRun = None kb.proxyAuthHeader = None