Attachment 154308 Details for Bug 239381 – patch from http://sourceforge.net/tracker/index.php?func=detail&aid=1521274&group_id=22307&atid=374932

[patch] patch from http://sourceforge.net/tracker/index.php?func=detail&aid=1521274&group_id=22307&atid=374932

mysqldb_unicode.patch (text/plain), 1.55 KB, created by ryo fujita on 2007-05-08 00:42:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ryo fujita

Created: 2007-05-08 00:42:51 UTC

Size: 1.55 KB

patch

obsolete

>Index: MySQLdb/MySQLdb/cursors.py
>===================================================================
>--- MySQLdb/MySQLdb/cursors.py	(revision 449)
>+++ MySQLdb/MySQLdb/cursors.py	(working copy)
>@@ -138,12 +138,13 @@
>         Returns long integer rows affected, if any
> 
>         """
>-        from types import ListType, TupleType
>+        from types import ListType, TupleType, UnicodeType
>         from sys import exc_info
>         del self.messages[:]
>         db = self._get_db()
>         charset = db.character_set_name()
>-        query = query.encode(charset)
>+        if isinstance(query,UnicodeType):
>+            query = query.encode(charset)
>         if args is not None:
>             query = query % db.literal(args)
>         try:
>@@ -183,6 +184,7 @@
>         execute().
> 
>         """
>+        from types import UnicodeType
>         del self.messages[:]
>         db = self._get_db()
>         if not args: return
>@@ -194,7 +196,8 @@
>             return r
>         p = m.start(1)
>         charset = db.character_set_name()
>-        query = query.encode(charset)
>+        if isinstance(query,UnicodeType):
>+            query = query.encode(charset)
>         qv = query[p:]
>         qargs = db.literal(args)
>         try:
>@@ -253,7 +256,7 @@
>         for index, arg in enumerate(args):
>             q = "SET @_%s_%d=%s" % (procname, index,
>                                          db.literal(arg))
>-            if type(q) is UnicodeType:
>+            if isinstance(q,UnicodeType):
>                 q = q.encode(charset)
>             self._query(q)
>             self.nextset()

Actions: View | Diff

Attachments on bug 239381: 154308