From 8f0807d7f940c69beed9fed9f4e58ca00424bab8 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Fri, 9 May 2014 22:55:16 +0200 Subject: [PATCH] Another fix related to the last commit --- lib/core/common.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/core/common.py b/lib/core/common.py index 6240059b9..aed3675e4 100755 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -1994,7 +1994,10 @@ def getUnicode(value, encoding=None, system=False, noneToNull=False): except UnicodeDecodeError, ex: return value[:ex.start] + "".join(INVALID_UNICODE_CHAR_FORMAT % ord(_) for _ in value[ex.start:ex.end]) + value[ex.end:] else: - return unicode(value, errors="ignore") # encoding ignored for non-basestring instances + try: + return unicode(value) + except UnicodeDecodeError: + return unicode(str(value), errors="ignore") # encoding ignored for non-basestring instances else: try: return getUnicode(value, sys.getfilesystemencoding() or sys.stdin.encoding)