Fix TypeError exception found in BUG22529828 patch using Python 2

nmariz · nmariz · commit 80b343048e0a · 2016-09-27T12:03:31.000+01:00
diff --git a/lib/mysql/connector/cursor.py b/lib/mysql/connector/cursor.py
@@ -96,15 +96,20 @@ def _bytestr_format_dict(bytestr, value_dict):
     b'x=%(y)s y=%(x)s'
     """
     def replace(matchobj):
+        value = None
         groups = matchobj.groupdict()
         if groups["conversion_type"] == b"%":
-            return b"%"
+            value = b"%"
         if groups["conversion_type"] == b"s":
-            return value_dict[groups["mapping_key"]]
-        raise ValueError("Unsupported conversion_type: {0}"
-                         "".format(groups["conversion_type"]))
-    return RE_PY_MAPPING_PARAM.sub(replace, bytestr)
-
+            key = groups["mapping_key"].encode("utf-8") \
+                  if PY2 else groups["mapping_key"]
+            value = value_dict[key]
+        if value is None:
+            raise ValueError("Unsupported conversion_type: {0}"
+                             "".format(groups["conversion_type"]))
+        return value.decode("utf-8") if PY2 else value
+    return RE_PY_MAPPING_PARAM.sub(replace, bytestr.decode("utf-8")
+                                   if PY2 else bytestr)
 
 class CursorBase(MySQLCursorAbstract):
     """
diff --git a/tests/test_cursor.py b/tests/test_cursor.py
@@ -361,6 +361,8 @@ def test__process_params(self):
             datetime.time(20, 3, 23),
             st_now,
             datetime.timedelta(hours=40, minutes=30, seconds=12),
+            'foo %(t)s',
+            'foo %(s)s',
         )
         exp = (
             b'NULL',
@@ -382,6 +384,8 @@ def test__process_params(self):
             b"'" + time.strftime('%Y-%m-%d %H:%M:%S', st_now).encode('ascii')
             + b"'",
             b"'40:30:12'",
+            b"'foo %(t)s'",
+            b"'foo %(s)s'",
         )
 
         self.cnx = connection.MySQLConnection(**tests.get_mysql_config())
