Merge pull request PyMySQL#24 from PyMySQL/fix/escape-string

methane · methane · commit cac52c954141 · 2015-02-24T15:00:32.000+09:00
Fix _mysql.escape_string()
diff --git a/_mysql.c b/_mysql.c
@@ -1079,7 +1079,7 @@ _mysql_escape_string(
 	PyObject *str;
 	char *in, *out;
 	int len, size;
-	if (!PyArg_ParseTuple(args, "y#:escape_string", &in, &size)) return NULL;
+	if (!PyArg_ParseTuple(args, "s#:escape_string", &in, &size)) return NULL;
 	str = PyBytes_FromStringAndSize((char *) NULL, size*2+1);
 	if (!str) return PyErr_NoMemory();
 	out = PyBytes_AS_STRING(str);
diff --git a/tests/test_MySQLdb_nonstandard.py b/tests/test_MySQLdb_nonstandard.py
@@ -41,6 +41,12 @@ def test_client_info(self):
     def test_thread_safe(self):
         self.assertTrue(isinstance(_mysql.thread_safe(), int))
 
+    def test_escape_string(self):
+        self.assertEqual(_mysql.escape_string(b'foo"bar'),
+                         b'foo\\"bar', "escape byte string")
+        self.assertEqual(_mysql.escape_string(u'foo"bar'),
+                         b'foo\\"bar', "escape unicode string")
+
 
 class CoreAPI(unittest.TestCase):
     """Test _mysql interaction internals."""
