Use db.unicode_literal.charset in cursors.py

evax · evax · commit 030d175754fb · 2012-10-08T19:16:01.000+02:00
diff --git a/MySQLdb/cursors.py b/MySQLdb/cursors.py
@@ -47,9 +47,6 @@
      NotSupportedError, ProgrammingError
 
 
-def normalize_utf8mb4(charset):
-    return 'utf8' if charset == 'utf8mb4' else charset
-
 class BaseCursor(object):
     
     """A base for Cursor classes. Useful attributes:
@@ -180,9 +177,8 @@ def execute(self, query, args=None):
         """
         del self.messages[:]
         db = self._get_db()
-        charset = normalize_utf8mb4(db.character_set_name())
         if isinstance(query, unicode):
-            query = query.encode(charset)
+            query = query.encode(db.unicode_literal.charset)
         if args is not None:
             query = query % db.literal(args)
         try:
@@ -228,8 +224,8 @@ def executemany(self, query, args):
         del self.messages[:]
         db = self._get_db()
         if not args: return
-        charset = normalize_utf8mb4(db.character_set_name())
-        if isinstance(query, unicode): query = query.encode(charset)
+        if isinstance(query, unicode):
+            query = query.encode(db.unicode_literal.charset)
         m = insert_values.search(query)
         if not m:
             r = 0
@@ -288,20 +284,19 @@ def callproc(self, procname, args=()):
         """
 
         db = self._get_db()
-        charset = db.character_set_name()
         for index, arg in enumerate(args):
             q = "SET @_%s_%d=%s" % (procname, index,
                                          db.literal(arg))
             if isinstance(q, unicode):
-                q = q.encode(charset)
+                q = q.encode(db.unicode_literal.charset)
             self._query(q)
             self.nextset()
             
         q = "CALL %s(%s)" % (procname,
                              ','.join(['@_%s_%d' % (procname, i)
                                        for i in range(len(args))]))
         if type(q) is UnicodeType:
-            q = q.encode(charset)
+            q = q.encode(db.unicode_literal.charset)
         self._query(q)
         self._executed = q
         if not self._defer_warnings: self._warning_check()
