summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2015-03-20 15:17:07 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2015-03-20 15:17:07 -0400
commit824e9013797cc20538b8002643057b0104081c1a (patch)
treeb56eadbb6ed5ceae3e339a0cba4d221eee94b9b8
parentffddfe1b17b5c09dcb6289f807200f7c8279190e (diff)
parent69dadc88e0b95e0fe1936ae09fd7d3e085f1df0a (diff)
downloadsqlalchemy-824e9013797cc20538b8002643057b0104081c1a.tar.gz
Merge branch 'mysqlclient' of https://bitbucket.org/methane/sqlalchemy into pr48
Conflicts: lib/sqlalchemy/dialects/mysql/mysqldb.py
-rw-r--r--lib/sqlalchemy/dialects/mysql/mysqldb.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/mysqldb.py b/lib/sqlalchemy/dialects/mysql/mysqldb.py
index c61b09846..c1c576e10 100644
--- a/lib/sqlalchemy/dialects/mysql/mysqldb.py
+++ b/lib/sqlalchemy/dialects/mysql/mysqldb.py
@@ -41,6 +41,15 @@ codepoints up to four bytes in size::
:ref:`mysql_unicode` - Includes background on the ``'utf8mb4'`` character set.
+Py3K Support
+------------
+
+Currently, MySQLdb only runs on Python 2 and development has been stopped.
+`mysqlclient`_ is fork of MySQLdb and provides Python 3 support as well
+as some bugfixes.
+
+.. _mysqlclient: https://github.com/PyMySQL/mysqlclient-python
+
Known Issues
-------------