Merge pull request #359 from friedererdmann/master

Actual fix for #346 - unroll of #357

Qt.py

@@ -1260,14 +1260,6 @@ def _setup(module, extras):
     Qt.__binding__ = module.__name__
 
     def _warn_import_error(exc, module):
-        if sys.version_info > (3, 0):
-            unicode = str
-        else:
-            try:
-                if isinstance(exc, unicode):
-                    exc = exc.encode('ascii', 'replace')
-            except (UnboundLocalError, NameError):
-                pass
         msg = str(exc)
         if "No module named" in msg:
             return
@@ -1690,7 +1682,12 @@ def _log(text):
 
 
 def _warn(text):
-    sys.stderr.write("Qt.py [warning]: %s\n" % text)
+    try:
+        sys.stderr.write("Qt.py [warning]: %s\n" % text)
+    except UnicodeDecodeError:
+        import locale
+        encoding = locale.getpreferredencoding()
+        sys.stderr.write("Qt.py [warning]: %s\n" % text.decode(encoding))
 
 
 def _convert(lines):

tests.py

@@ -1,3 +1,4 @@
+# coding=utf-8
 """Tests that run once"""
 import io
 import os
@@ -891,6 +892,19 @@ def test_missing():
     )
 
 
+def test_unicode_error_messages():
+    """Test if unicode error messages with non-ascii characters
+    throw the error reporter off"""
+    import Qt
+    unicode_message = u"DLL load failed : le module spécifié est introuvable."
+    str_message = "DLL load failed : le module"
+
+    with captured_output() as out:
+        stdout, stderr = out
+        Qt._warn(text=unicode_message)
+        assert str_message in stderr.getvalue()
+
+
 if sys.version_info < (3, 5):
     # PySide is not available for Python > 3.4
     # Shiboken(1) doesn't support Python 3.5