Patch for an Issue #978

This commit is contained in:
Miroslav Stampar
2014-11-29 23:33:24 +01:00
parent ab49fe6a39
commit 56b6bf72f4
3 changed files with 12 additions and 5 deletions

View File

@@ -2068,7 +2068,10 @@ def getUnicode(value, encoding=None, noneToNull=False):
try:
return unicode(value, encoding or kb.get("pageEncoding") or UNICODE_ENCODING)
except UnicodeDecodeError, ex:
value = value[:ex.start] + "".join(INVALID_UNICODE_CHAR_FORMAT % ord(_) for _ in value[ex.start:ex.end]) + value[ex.end:]
try:
return unicode(value, UNICODE_ENCODING)
except:
value = value[:ex.start] + "".join(INVALID_UNICODE_CHAR_FORMAT % ord(_) for _ in value[ex.start:ex.end]) + value[ex.end:]
else:
try:
return unicode(value)