summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py5
-rw-r--r--lib/sqlalchemy/dialects/mysql/pymysql.py12
2 files changed, 17 insertions, 0 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 62598ad00..3720c4e62 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -1932,6 +1932,11 @@ class MySQLDialect(default.DefaultDialect):
cursor.execute('SELECT @@tx_isolation')
val = cursor.fetchone()[0]
cursor.close()
+ # Py3K
+ #if isinstance(val, bytes):
+ # val = val.decode()
+ # Py2K
+ # end Py2K
return val.upper().replace("-", " ")
def do_commit(self, dbapi_connection):
diff --git a/lib/sqlalchemy/dialects/mysql/pymysql.py b/lib/sqlalchemy/dialects/mysql/pymysql.py
index d70e997f7..25e2dadd3 100644
--- a/lib/sqlalchemy/dialects/mysql/pymysql.py
+++ b/lib/sqlalchemy/dialects/mysql/pymysql.py
@@ -28,9 +28,21 @@ class MySQLDialect_pymysql(MySQLDialect_mysqldb):
driver = 'pymysql'
description_encoding = None
+ # Py3K
+ #supports_unicode_statements = True
+ # Py2K
+ # end Py2K
@classmethod
def dbapi(cls):
return __import__('pymysql')
+ # Py3K
+ #def _extract_error_code(self, exception):
+ # if isinstance(exception.args[0], Exception):
+ # exception = exception.args[0]
+ # return exception.args[0]
+ # Py2K
+ # end Py2K
+
dialect = MySQLDialect_pymysql