Fix escaping bytearray on PY2

methane · methane · commit 1cc949450482 · 2016-01-08T22:49:46.000+09:00
diff --git a/pymysql/converters.py b/pymysql/converters.py
@@ -81,7 +81,7 @@ def escape_string(value, mapping=None):
         """
         if isinstance(value, unicode):
             return escape_unicode(value)
-        assert isinstance(value, bytes)
+        assert isinstance(value, (bytes, bytearray))
         value = value.replace('\\', '\\\\')
         value = value.replace('\0', '\\0')
         value = value.replace('\n', '\\n')
@@ -93,7 +93,7 @@ def escape_string(value, mapping=None):
 
     def escape_bytes(value, mapping=None):
         assert isinstance(value, (bytes, bytearray))
-        return b"_binary'%s'" % value
+        return b"_binary'%s'" % escape_string(value)
 else:
     escape_string = _escape_unicode
 
