you can't believe how much man can learn when having good testing points

lib/core/common.py

@@ -425,7 +425,7 @@ def dataToStdout(data, forceOutput=False):
             try:
                 sys.stdout.write(data)
             except UnicodeEncodeError:
-                sys.stdout.write(data.encode(kb.pageEncoding or conf.dataEncoding))
+                sys.stdout.write(data.encode(conf.dataEncoding))
             finally:
                 sys.stdout.flush()
 
@@ -1515,11 +1515,17 @@ def getUnicode(value, encoding=None):
     u'1'
     """
 
-    if isinstance(value, basestring):
-        return value if isinstance(value, unicode) else unicode(value, encoding or kb.pageEncoding or conf.dataEncoding, errors='replace')
+    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)
     else:
         return unicode(value) # encoding ignored for non-basestring instances
 
+
 # http://boredzo.org/blog/archives/2007-01-06/longest-common-prefix-in-python-2
 def longestCommonPrefix(*sequences):
     if len(sequences) == 1:

lib/request/basic.py

@@ -142,7 +142,7 @@ def decodePage(page, contentEncoding, contentType):
     charset = checkCharEncoding(charset)
     kb.pageEncoding = charset or DEFAULT_PAGE_ENCODING
 
-    return getUnicode(page)
+    return getUnicode(page, kb.pageEncoding)
 
 def processResponse(page, responseHeaders):
     page = getUnicode(page)