python/mysqlclient
1
0
Fork 0
mirror of https://github.com/PyMySQL/mysqlclient.git synced 2025-08-15 19:31:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Connection.literal() always returns str instance.

Browse Source
This commit is contained in:
INADA Naoki
2014-04-17 22:36:01 +09:00
parent 382fb9f9b3
commit c66b43cc22
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MySQLdb/connections.py
View File

@ -13,6 +13,9 @@ from _mysql_exceptions import Warning, Error, InterfaceError, DataError, \
NotSupportedError, ProgrammingError
import _mysql
import re
import sys
PY2 = sys.version_info[0] == 2
def defaulterrorhandler(connection, cursor, errorclass, errorvalue):
@ -280,7 +283,10 @@ class Connection(_mysql.connection):
applications.
"""
return self.escape(o, self.encoders)
s = self.escape(o, self.encoders)
if not PY2 and isinstance(s, bytes):
return s.decode('ascii', 'surrogateescape')
return s
def begin(self):
"""Explicitly begin a connection. Non-standard.