important fix for a bug reported by x <deep_freeze@mail.ru> (along with normal fixes, getUnicode now uses kb.pageEncoding)

This commit is contained in:
Miroslav Stampar
2011-01-03 22:02:58 +00:00
parent 572f403069
commit 08ccbf2c1e
5 changed files with 22 additions and 16 deletions

View File

@@ -1510,10 +1510,8 @@ def getUnicode(value, encoding=None):
u'1'
"""
if encoding is None:
encoding = conf.dataEncoding if 'dataEncoding' in conf else "utf-8"
if isinstance(value, basestring):
return value if isinstance(value, unicode) else unicode(value, encoding, errors='replace')
return value if isinstance(value, unicode) else unicode(value, encoding or kb.pageEncoding or "utf-8", errors='replace')
else:
return unicode(value) # encoding ignored for non-basestring instances

View File

@@ -1183,6 +1183,7 @@ def __setKnowledgeBaseAttributes(flushAll=True):
kb.osVersion = None
kb.osSP = None
kb.pageEncoding = "utf-8"
kb.pageStable = None
kb.partRun = None
kb.proxyAuthHeader = None