Edgewall Software

Ticket #2529: db_unicodedecodeerror_workaround.diff

File db_unicodedecodeerror_workaround.diff, 0.7 KB (added by koral, 3 years ago)
  • db.py

    old new  
    223223            return self._rollback_on_error(sqlite.Cursor.executemany, sql, 
    224224                                           args or []) 
    225225        def _convert_row(self, row): 
    226             return tuple([(isinstance(v, unicode) and [v.encode('utf-8')] or [v])[0] 
    227                           for v in row]) 
     226           try: 
     227               return tuple([(isinstance(v, unicode) and [v.encode('utf-8')] or [v])[0] for v in row]) 
     228           except: 
     229               return tuple([[v][0] for v in row]) 
    228230        def fetchone(self): 
    229231            row = sqlite.Cursor.fetchone(self) 
    230232            return row and self._convert_row(row) or None