From 89e0fd070964f5076ae933df122052c68c12b9a9 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 19 Jan 2011 14:06:26 +0000 Subject: [PATCH] back to roots --- lib/core/common.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/core/common.py b/lib/core/common.py index 06a1a5630..751bfb8ea 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -1518,10 +1518,7 @@ def getUnicode(value, encoding=None): if isinstance(value, unicode): return value elif isinstance(value, basestring): - if encoding and encoding != conf.dataEncoding: - # transencoding from encoding to conf.dataEncoding - value = unicode(value, encoding, errors='replace').encode(conf.dataEncoding) - return unicode(value, conf.dataEncoding) + return unicode(value, encoding or conf.dataEncoding, errors='replace') else: return unicode(value) # encoding ignored for non-basestring instances