Use cp1252 encoding for latin1 charset (#824)

PyMySQL · Nov 21, 2019 · a4f9847 · a4f9847 · francisar · Apr 25, 2021
1 parent c3e5a63
commit a4f9847
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/pymysql/charset.py b/pymysql/charset.py
@@ -20,6 +20,12 @@ def encoding(self):
         name = self.name
         if name in ('utf8mb4', 'utf8mb3'):
             return 'utf8'
+        if name == 'latin1':
+            return 'cp1252'
+        if name == 'koi8r':
+            return 'koi8_r'
+        if name == 'koi8u':
+            return 'koi8_u'
         return name
 
     @property
@@ -202,11 +208,3 @@ def by_name(self, name):
 
 charset_by_name = _charsets.by_name
 charset_by_id = _charsets.by_id
-
-
-#TODO: remove this
-def charset_to_encoding(name):
-    """Convert MySQL's charset name to Python's codec name"""
-    if name in ('utf8mb4', 'utf8mb3'):
-        return 'utf8'
-    return name
diff --git a/pymysql/converters.py b/pymysql/converters.py
@@ -6,7 +6,7 @@
 import time
 
 from .constants import FIELD_TYPE, FLAG
-from .charset import charset_by_id, charset_to_encoding
+from .charset import charset_by_id
 
 
 def escape_item(val, charset, mapping=None):