summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2014-02-03 12:04:51 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2014-02-03 12:04:51 -0500
commit8b08b1a35b85c24349226c34e6834f4f60db3c6f (patch)
tree5a9f2e63ecc8cb1983b301bb4cd62580bb151926 /lib/sqlalchemy/sql
parent37d1f8983ce4bfbfd517cf8db7a44ed785c8474f (diff)
downloadsqlalchemy-8b08b1a35b85c24349226c34e6834f4f60db3c6f.tar.gz
- Fixed bug which prevented MySQLdb-based dialects (e.g.
pymysql) from working in Py3K, where a check for "connection charset" would fail due to Py3K's more strict value comparison rules. The call in question wasn't taking the database version into account in any case as the server version was still None at that point, so the method overall has been simplified to rely upon connection.character_set_name(). [ticket:2933]
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/sqltypes.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/sqltypes.py b/lib/sqlalchemy/sql/sqltypes.py
index 61d906e1c..fee424e65 100644
--- a/lib/sqlalchemy/sql/sqltypes.py
+++ b/lib/sqlalchemy/sql/sqltypes.py
@@ -198,7 +198,6 @@ class String(Concatenable, TypeEngine):
dialect.returns_unicode_strings and
self.convert_unicode != 'force_nocheck'
)
-
if needs_convert:
to_unicode = processors.to_unicode_processor_factory(
dialect.encoding, self.unicode_error)