try to fix broken conv

PyMySQL · Jan 3, 2024 · f953913 · f953913
1 parent a2212b3
commit f953913
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 25 deletions.
diff --git a/src/MySQLdb/connections.py b/src/MySQLdb/connections.py
@@ -160,10 +160,27 @@ class object, used to create cursors (keyword only)
         if "passwd" in kwargs2:
             kwargs2["password"] = kwargs2.pop("passwd")
 
+        use_unicode = kwargs2.pop("use_unicode", True)
+        default_conversions = conversions.copy()
+        if not use_unicode:
+            for t in (
+                FIELD_TYPE.STRING,
+                FIELD_TYPE.VAR_STRING,
+                FIELD_TYPE.VARCHAR,
+                FIELD_TYPE.TINY_BLOB,
+                FIELD_TYPE.MEDIUM_BLOB,
+                FIELD_TYPE.LONG_BLOB,
+                FIELD_TYPE.BLOB,
+            ):
+                default_conversions[t] = bytes
+            # Unlike other string/blob types, JSON is always text.
+            # MySQL may return JSON with charset==binary.
+            default_conversions[FIELD_TYPE.JSON] = bytes
+
         if "conv" in kwargs:
             conv = kwargs["conv"]
         else:
-            conv = conversions
+            conv = default_conversions
 
         conv2 = {}
         for k, v in conv.items():
@@ -176,7 +193,6 @@ class object, used to create cursors (keyword only)
         cursorclass = kwargs2.pop("cursorclass", self.default_cursor)
         charset = kwargs2.get("charset", "")
         collation = kwargs2.pop("collation", "")
-        use_unicode = kwargs2.pop("use_unicode", True)
         sql_mode = kwargs2.pop("sql_mode", "")
         self._binary_prefix = kwargs2.pop("binary_prefix", False)
 
@@ -209,21 +225,6 @@ class object, used to create cursors (keyword only)
         if sql_mode:
             self.set_sql_mode(sql_mode)
 
-        if use_unicode:
-            for t in (
-                FIELD_TYPE.STRING,
-                FIELD_TYPE.VAR_STRING,
-                FIELD_TYPE.VARCHAR,
-                FIELD_TYPE.TINY_BLOB,
-                FIELD_TYPE.MEDIUM_BLOB,
-                FIELD_TYPE.LONG_BLOB,
-                FIELD_TYPE.BLOB,
-            ):
-                self.converter[t] = _bytes_or_str
-            # Unlike other string/blob types, JSON is always text.
-            # MySQL may return JSON with charset==binary.
-            self.converter[FIELD_TYPE.JSON] = str
-
         self._transactional = self.server_capabilities & CLIENT.TRANSACTIONS
         if self._transactional:
             if autocommit is not None:

diff --git a/src/MySQLdb/converters.py b/src/MySQLdb/converters.py
@@ -128,12 +128,12 @@ def array2Str(o, d):
     FIELD_TYPE.DATETIME: DateTime_or_None,
     FIELD_TYPE.TIME: TimeDelta_or_None,
     FIELD_TYPE.DATE: Date_or_None,
-    FIELD_TYPE.TINY_BLOB: bytes,
-    FIELD_TYPE.MEDIUM_BLOB: bytes,
-    FIELD_TYPE.LONG_BLOB: bytes,
-    FIELD_TYPE.BLOB: bytes,
-    FIELD_TYPE.STRING: bytes,
-    FIELD_TYPE.VAR_STRING: bytes,
-    FIELD_TYPE.VARCHAR: bytes,
-    FIELD_TYPE.JSON: bytes,
+    FIELD_TYPE.TINY_BLOB: _bytes_or_str,
+    FIELD_TYPE.MEDIUM_BLOB: _bytes_or_str,
+    FIELD_TYPE.LONG_BLOB: _bytes_or_str,
+    FIELD_TYPE.BLOB: _bytes_or_str,
+    FIELD_TYPE.STRING: _bytes_or_str,
+    FIELD_TYPE.VAR_STRING: _bytes_or_str,
+    FIELD_TYPE.VARCHAR: _bytes_or_str,
+    FIELD_TYPE.JSON: str,
 }