Patch for an Issue #978

stamparm · stamparm · commit 56b6bf72f440 · 2014-11-29T23:33:24.000+01:00
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -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)
diff --git a/lib/core/convert.py b/lib/core/convert.py
@@ -145,17 +145,21 @@ def htmlunescape(value):
     return retVal
 
 def singleTimeWarnMessage(message):  # Cross-linked function
-    raise NotImplementedError
+    sys.stdout.write(message)
+    sys.stdout.write("\n")
+    sys.stdout.flush()
 
 def stdoutencode(data):
     retVal = None
 
     try:
+        data = data or ""
+
         # Reference: http://bugs.python.org/issue1602
         if IS_WIN:
-            output = data.encode("ascii", "replace")
+            output = data.encode(sys.stdout.encoding, "replace")
 
-            if output != data:
+            if '?' in output:
                 warnMsg = "cannot properly display Unicode characters "
                 warnMsg += "inside Windows OS command prompt "
                 warnMsg += "(http://bugs.python.org/issue1602). All "
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
@@ -791,7 +791,7 @@ def _(self, *args):
         advancedHelp = True
 
         for arg in sys.argv:
-            argv.append(getUnicode(arg, encoding=sys.stdin.encoding))
+            argv.append(getUnicode(arg, encoding=sys.getfilesystemencoding()))
 
         checkDeprecatedOptions(argv)
 
