From 396ec2290b2e7dfdeaf9657ab08e970439bd0065 Mon Sep 17 00:00:00 2001 From: Giuseppe Sucameli Date: Sun, 4 Oct 2015 18:02:14 +0200 Subject: [PATCH] DBManager: fix int/float conversion to unicode (partially revert changes in 401f43c and fix #13505) --- python/plugins/db_manager/db_plugins/data_model.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python/plugins/db_manager/db_plugins/data_model.py b/python/plugins/db_manager/db_plugins/data_model.py index 4d317b8b6de..7f84e9520d4 100644 --- a/python/plugins/db_manager/db_plugins/data_model.py +++ b/python/plugins/db_manager/db_plugins/data_model.py @@ -76,7 +76,10 @@ class BaseTableModel(QAbstractTableModel): elif isinstance(val, (str, unicode)) and len(val) > 300: # too much data to display, elide the string val = val[:300] - return unicode(val, 'utf-8', 'replace') # convert from utf8 and replace errors (if any) + 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: