Changeset 3310 for pykota/trunk/pykota/utils.py

Timestamp:

01/30/08 23:16:51 (16 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).

Files:

• pykota/trunk/pykota/utils.py (modified) (2 diffs)

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