summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Grainger <tagrain@gmail.com>2015-03-17 17:16:40 +0000
committerThomas Grainger <tagrain@gmail.com>2015-03-17 17:16:40 +0000
commit446330ee002cf31c1aee8ed6422730845a2cef27 (patch)
treed545bbe65c59d59df0357fe85b72647ca8bc5098
parentaef32c8fd6e5550ac54a295169fa38dcfa7e9db6 (diff)
downloadsqlalchemy-pr/162.tar.gz
Fixuppr/162
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index ed11080be..f5c62327d 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -3309,7 +3309,7 @@ class _DecodingRowProxy(object):
item = item.tostring()
if self.charset and isinstance(item, util.binary_type):
- return item.decode(charset)
+ return item.decode(self.charset)
else:
return item