[py3] Followup bad0d3e: Don't decode unencoded strings

qgis · Jun 7, 2016 · d0feea5 · d0feea5
1 parent 7a8d9dd
commit d0feea5
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/python/utils.py b/python/utils.py
@@ -65,9 +65,18 @@
 
 
 def showWarning(message, category, filename, lineno, file=None, line=None):
-    stk = ''.join([s.decode(sys.getfilesystemencoding()) for s in traceback.format_stack()[:-2]])
+    stk = ""
+    for s in traceback.format_stack()[:-2]:
+        if hasattr(s, 'decode'):
+            stk += s.decode(sys.getfilesystemencoding())
+        else:
+            stk += s
+    if hasattr(filename, 'decode'):
+        decoded_filename = filename.decode(sys.getfilesystemencoding())
+    else:
+        decoded_filename = filename
     QgsMessageLog.logMessage(
-        u"warning:{}\ntraceback:{}".format(warnings.formatwarning(message, category, filename.decode(sys.getfilesystemencoding()), lineno), stk),
+        u"warning:{}\ntraceback:{}".format(warnings.formatwarning(message, category, decoded_filename, lineno), stk),
         QCoreApplication.translate("Python", "Python warning")
     )