Workaround for recommended MySQL 5.5 utf8mb4 character set, which is not recognized by Python yet.

farcepest · farcepest · commit 7d4993a53c97 · 2012-10-05T14:01:51.000-04:00
diff --git a/MySQLdb/connections.py b/MySQLdb/connections.py
@@ -289,6 +289,10 @@ def set_character_set(self, charset):
         set can only be changed in MySQL-4.1 and newer. If you try
         to change the character set from the current value in an
         older version, NotSupportedError will be raised."""
+        if charset == "utf8mb4":
+            py_charset = "utf8"
+        else:
+            py_charset = charset
         if self.character_set_name() != charset:
             try:
                 super(Connection, self).set_character_set(charset)
@@ -297,8 +301,8 @@ def set_character_set(self, charset):
                     raise NotSupportedError("server is too old to set charset")
                 self.query('SET NAMES %s' % charset)
                 self.store_result()
-        self.string_decoder.charset = charset
-        self.unicode_literal.charset = charset
+        self.string_decoder.charset = py_charset
+        self.unicode_literal.charset = py_charset
 
     def set_sql_mode(self, sql_mode):
         """Set the connection sql_mode. See MySQL documentation for
diff --git a/tests/default.cnf b/tests/default.cnf
@@ -7,4 +7,4 @@ host = 127.0.0.1
 user = test
 database = test
 #password =
-default-character-set = utf8
+default-character-set = utf8mb4
diff --git a/tests/travis.cnf b/tests/travis.cnf
@@ -7,4 +7,4 @@ host = 127.0.0.1
 user = root
 database = mysqldb_test
 #password =
-default-character-set = utf8
+default-character-set = utf8mb4
