From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 2 Nov 2011 16:34:55 +0000 (-0400)
Subject: - [bug] Unicode adjustments allow latest pymysql
X-Git-Tag: rel_0_7_4~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b746921e78f3890f643ed6581ac01b25f673b476;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- [bug] Unicode adjustments allow latest pymysql
(post 0.4) to pass 100% on Python 2.
---

diff --git a/CHANGES b/CHANGES
index dfa1f75830..0ffaa8072f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -120,6 +120,9 @@ CHANGES
      "checkfirst" turned on it only needs to 
      check for the ENUM once.  [ticket:2311]
 
+- mysql
+  - [bug] Unicode adjustments allow latest pymysql 
+    (post 0.4) to pass 100% on Python 2.
 
 0.7.3
 =====
diff --git a/lib/sqlalchemy/dialects/mysql/pymysql.py b/lib/sqlalchemy/dialects/mysql/pymysql.py
index dee3dfeaa1..04c011211b 100644
--- a/lib/sqlalchemy/dialects/mysql/pymysql.py
+++ b/lib/sqlalchemy/dialects/mysql/pymysql.py
@@ -31,6 +31,7 @@ from sqlalchemy.dialects.mysql.mysqldb import MySQLDialect_mysqldb
 class MySQLDialect_pymysql(MySQLDialect_mysqldb): 
     driver = 'pymysql'
 
+    description_encoding = None
     @classmethod 
     def dbapi(cls): 
         return __import__('pymysql') 
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 987e97f9bc..efad45501f 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -652,6 +652,7 @@ class UnicodeTest(fixtures.TestBase, AssertsExecutionResults):
                 ('mysql','oursql'),
                 ('mysql','zxjdbc'),
                 ('mysql','mysqlconnector'),
+                ('mysql','pymysql'),
                 ('sqlite','pysqlite'),
                 ('oracle','zxjdbc'),
                 ('oracle','cx_oracle'),