summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects/mysql/base.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-03-21 15:10:51 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-03-21 15:10:51 -0400
commit1447abc5347bee5b8611bebe1ae628b32674dc95 (patch)
treed3afa456f705e9c0e37e265acbf9312308d6ccfc /lib/sqlalchemy/dialects/mysql/base.py
parentc09c21c9f31826e126b97d6318a9df66986af774 (diff)
downloadsqlalchemy-fix_mysqlconnector.tar.gz
- wip for #3336fix_mysqlconnector
Diffstat (limited to 'lib/sqlalchemy/dialects/mysql/base.py')
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index a74b20ac4..43553a69c 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -2449,7 +2449,7 @@ class MySQLDialect(default.DefaultDialect):
cursor.execute('SELECT @@tx_isolation')
val = cursor.fetchone()[0]
cursor.close()
- if util.py3k and isinstance(val, bytes):
+ if util.py3k and isinstance(val, util.all_binary_types):
val = val.decode()
return val.upper().replace("-", " ")
@@ -3358,7 +3358,7 @@ class _DecodingRowProxy(object):
if isinstance(item, _array):
item = item.tostring()
- if self.charset and isinstance(item, util.binary_type):
+ if self.charset and isinstance(item, util.all_binary_types):
return item.decode(self.charset)
else:
return item
@@ -3367,7 +3367,7 @@ class _DecodingRowProxy(object):
item = getattr(self.rowproxy, attr)
if isinstance(item, _array):
item = item.tostring()
- if self.charset and isinstance(item, util.binary_type):
+ if self.charset and isinstance(item, util.all_binary_types):
return item.decode(self.charset)
else:
return item