sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

DBManager: fix data conversion to unicode (errors='replace' should be enough)

Browse Source
This commit is contained in:
Giuseppe Sucameli 2015-10-01 00:29:38 +02:00
parent a7cd1985ed
commit 401f43c590
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/plugins/db_manager/db_plugins/data_model.py
View File

@ -75,11 +75,8 @@ class BaseTableModel(QAbstractTableModel):
return None return None
elif isinstance(val, (str, unicode)) and len(val) > 300: elif isinstance(val, (str, unicode)) and len(val) > 300:
# too much data to display, elide the string # too much data to display, elide the string
return u"%s..." % val[:300] val = val[:300]
try: return unicode(val, 'utf-8', 'replace') # convert from utf8 and replace errors (if any)
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): def headerData(self, section, orientation, role):

5
python/plugins/db_manager/db_plugins/plugin.py
View File

@ -37,10 +37,7 @@ class BaseError(Exception):
else: else:
msg = e msg = e
try: msg = unicode(msg, 'utf-8', 'replace') # convert from utf8 and replace errors (if any)
msg = unicode(msg) # convert to unicode
except UnicodeDecodeError:
msg = unicode(msg, 'utf-8', 'replace') # convert from utf8 and replace errors (if any)
self.msg = msg self.msg = msg
Exception.__init__(self, msg) Exception.__init__(self, msg)