More unicode/utf8 fixes

strk · strk · commit 14ab5eb0bda9 · 2017-06-06T23:41:14.000+02:00
diff --git a/python/plugins/db_manager/db_plugins/connector.py b/python/plugins/db_manager/db_plugins/connector.py
@@ -78,7 +78,7 @@ def _execute(self, cursor, sql):
         if cursor is None:
             cursor = self._get_cursor()
         try:
-            cursor.execute(unicode(sql))
+            cursor.execute(str(sql))
 
         except self.connection_error_types() as e:
             raise ConnectionError(e)
@@ -98,7 +98,7 @@ def _execute_and_commit(self, sql):
     def _get_cursor(self, name=None):
         try:
             if name is not None:
-                name = unicode(name).encode('ascii', 'replace').replace('?', "_")
+                name = str(name).encode('ascii', 'replace').replace('?', "_")
                 self._last_cursor_named_id = 0 if not hasattr(self,
                                                               '_last_cursor_named_id') else self._last_cursor_named_id + 1
                 return self.connection.cursor("%s_%d" % (name, self._last_cursor_named_id))
@@ -181,16 +181,16 @@ def _get_cursor_columns(self, c):
 
     @classmethod
     def quoteId(self, identifier):
-        if hasattr(identifier, '__iter__'):
+        if hasattr(identifier, '__iter__') and not isinstance(identifier, str):
             ids = list()
             for i in identifier:
                 if i is None or i == "":
                     continue
                 ids.append(self.quoteId(i))
             return u'.'.join(ids)
 
-        identifier = unicode(
-            identifier) if identifier is not None else unicode()  # make sure it's python unicode string
+        identifier = str(
+            identifier) if identifier is not None else str()  # make sure it's python unicode string
         return u'"%s"' % identifier.replace('"', '""')
 
     @classmethod
@@ -204,12 +204,12 @@ def quoteString(self, txt):
                 txts.append(self.quoteString(i))
             return u'.'.join(txts)
 
-        txt = unicode(txt) if txt is not None else unicode()  # make sure it's python unicode string
+        txt = str(txt) if txt is not None else str()  # make sure it's python unicode string
         return u"'%s'" % txt.replace("'", "''")
 
     @classmethod
     def getSchemaTableName(self, table):
-        if not hasattr(table, '__iter__'):
+        if not hasattr(table, '__iter__') and not isinstance(table, str):
             return (None, table)
         if isinstance(table, str):
             table = table.split('.')
