Changeset 3310

Timestamp:

01/30/08 23:16:51 (17 years ago)

Author:

jerome

Message:

Added a workaround for buggy versions of python-mysqldb (e.g
1.2.1-p2-4 on my Debian Etch box) which have the double
encoding bug (#1521274 on sourceforge.net).

Location:

pykota/trunk/pykota

Files:

• storages/mysqlstorage.py (modified) (8 diffs)
• utils.py (modified) (2 diffs)

pykota/trunk/pykota/storages/mysqlstorage.py

@@ -58 +58 @@
         self.cursor.execute("SET NAMES 'utf8';")
         self.cursor.execute("SET TRANSACTION ISOLATION LEVEL READ COMMITTED;") # Same as PostgreSQL and Oracle's default
-        self.closed = 0
+        self.closed = False
         self.tool.logdebug("Database opened (host=%s, port=%s, dbname=%s, user=%s)" % (host, port, dbname, user))
+        try :
+            # Here we try to select a string (an é) which is
+            # already encoded in UTF-8. If python-mysqldb suffers from 
+            # the double encoding problem, we will catch the exception
+            # and activate a workaround.
+            self.cursor.execute("SELECT '%s';" % (chr(0xc3) + chr(0xa9))) # é in UTF-8
+            self.cursor.fetchall()
+        except UnicodeDecodeError :    
+            self.needsworkaround = True
+            self.tool.logdebug("Database needs encoding workaround.")
+        else :
+            self.needsworkaround = False
+            self.tool.logdebug("Database doesn't need encoding workaround.")
             
     def close(self) :    
@@ -66 +79 @@
             self.cursor.close()
             self.database.close()
-            self.closed = 1
+            self.closed = True
             self.tool.logdebug("Database closed.")
         
@@ -89 +102 @@
         if not query.endswith(';') :    
             query += ';'
+        self.querydebug("QUERY : %s" % query)
+        if self.needsworkaround :    
+            query = query.decode("UTF-8")
         try :
-            self.querydebug("QUERY : %s" % query)
             self.cursor.execute(query)
         except self.database.Error, msg :    
@@ -96 +111 @@
         else :    
             # This returns a list of lists. Integers are returned as longs.
-            result = self.cursor.fetchall()
-            return result
+            return self.cursor.fetchall()
             
     def doSearch(self, query) :        
@@ -110 +124 @@
                 rowdict = {}
                 for field in fields.keys() :
-                    value = row[field]
-                    try :
-                        value = value.encode("UTF-8")
-                    except:
-                        pass
-                    rowdict[fields[field]] = value
+                    rowdict[fields[field]] = row[field]
                 rows.append(rowdict)
             # returns a list of dicts
@@ -125 +134 @@
         if not query.endswith(';') :    
             query += ';'
+        self.querydebug("QUERY : %s" % query)
+        if self.needsworkaround :    
+            query = query.decode("UTF-8")
         try :
-            self.querydebug("QUERY : %s" % query)
             self.cursor.execute(query)
         except self.database.Error, msg :    
@@ -141 +152 @@
             return field
         elif field is not None :
-            newfield = self.database.string_literal(field)
-            try :
-                return newfield.encode("UTF-8")
-            except :    
-                return newfield
+            return self.database.string_literal(field)
         else :
-            self.tool.logdebug("WARNING: field has no type, returning NULL")
             return "NULL"
 
@@ -153 +159 @@
         """Prepares a raw result by including the headers."""
         if result :
-            entries = [tuple([f[0] for f in self.cursor.description])]
-            for entry in result :
-                row = []
-                for value in entry :
-                    try :
-                        value = value.encode("UTF-8")
-                    except :
-                        pass
-                    row.append(value)
-                entries.append(tuple(row))
-            return entries
+            return [tuple([f[0] for f in self.cursor.description])] \
+                 + list(result)

pykota/trunk/pykota/utils.py

@@ -26 +26 @@
 import locale
 import gettext
+from types import UnicodeType
 
 def initlocale(lang="", cset=None) :
@@ -94 +95 @@
     """
     if text is not None :
-        return text.decode("UTF-8", "replace")
+        if not isinstance(text, UnicodeType) :
+            return text.decode("UTF-8", "replace")
+        else :    
+            # MySQL already returns unicode objects
+            return text
     else : 
         return None