From 1cc9494504824c7666952c643c3386a978b6a202 Mon Sep 17 00:00:00 2001 From: INADA Naoki Date: Fri, 8 Jan 2016 22:49:46 +0900 Subject: [PATCH] Fix escaping bytearray on PY2 --- pymysql/converters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pymysql/converters.py b/pymysql/converters.py index 0ffb1e6..44f86cc 100644 --- a/pymysql/converters.py +++ b/pymysql/converters.py @@ -81,7 +81,7 @@ if PY2: """ 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 @@ if PY2: 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