Properly handle filsystem character encoding when showing warnings

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