DBManager: fix unicode error display table data (fix #13447)

qgis · Sep 29, 2015 · 0c480a9 · m-kuhn · Sep 30, 2015 · m-kuhn
1 parent ece1169
commit 0c480a9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/python/plugins/db_manager/db_plugins/data_model.py b/python/plugins/db_manager/db_plugins/data_model.py
@@ -76,7 +76,11 @@ def data(self, index, role):
         elif isinstance(val, (str, unicode)) and len(val) > 300:
             # too much data to display, elide the string
             return u"%s..." % val[:300]
-        return unicode(val)  # convert to string
+        try:
+            return unicode(val)  # convert to unicode
+        except UnicodeDecodeError:
+            return unicode(val, 'utf-8', 'replace') # convert from utf8 and replace errors (if any)
+
 
     def headerData(self, section, orientation, role):
         if role != Qt.DisplayRole:

diff --git a/python/plugins/db_manager/db_plugins/plugin.py b/python/plugins/db_manager/db_plugins/plugin.py
@@ -38,9 +38,9 @@ def __init__(self, e):
             msg = e
 
         try:
-            msg = unicode(msg)
+            msg = unicode(msg) # convert to unicode
         except UnicodeDecodeError:
-            msg = unicode(msg, 'utf-8')
+            msg = unicode(msg, 'utf-8', 'replace') # convert from utf8 and replace errors (if any)
 
         self.msg = msg
         Exception.__init__(self, msg)