Switch MySQL driver to MySQL-connector

Author: gjhiggins

requirements-py3.txt

@@ -1,3 +1,4 @@
 -e git+https://github.com/RDFLib/rdflib.git#egg=rdflib
 psycopg2
--e git+https://github.com/davispuh/MySQL-for-Python-3#egg=MySQL-python
+http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-1.0.10.zip
+# -e git+https://github.com/davispuh/MySQL-for-Python-3#egg=MySQL-python

test/test_sqlalchemy_mysql.py

@@ -1,12 +1,21 @@
 import unittest
 from nose import SkipTest
+from rdflib.py3compat import PY3
 import os
 if os.environ.get('DB') != 'mysql':
     raise SkipTest("MySQL not under test")
-try:
-    import MySQLdb
-except ImportError:
-    raise SkipTest("MySQLdb not found, skipping MySQL tests")
+if PY3:
+    try:
+        import mysql
+        assert mysql
+    except ImportError:
+        raise SkipTest("MySQL-connector not found, skipping MySQL tests")
+else:
+    try:
+        import MySQLdb
+        assert MySQLdb
+    except ImportError:
+        raise SkipTest("MySQLdb not found, skipping MySQL tests")
 import logging
 _logger = logging.getLogger(__name__)
 from . import context_case
@@ -16,7 +25,7 @@
 # Specific to Travis-ci continuous integration and testing ...
 sqlalchemy_url = Literal(os.environ.get(
     'DBURI',
-    "mysql://[email protected]:3306/rdflibsqla_test?charset=utf8"))
+    "mysql+mysqlconnector://[email protected]:3306/rdflibsqla_test?charset=utf8"))
 # Generally ...
 # sqlalchemy_url = Literal(
 #    "mysql+mysqldb://user:password@hostname:port/database?charset=utf8")
@@ -52,7 +61,7 @@ def tearDown(self):
     def testLenInMultipleContexts(self):
         raise SkipTest("Known issue.")
 
-    
+
 class SQLAMySQLIssueTestCase(unittest.TestCase):
     storetest = True
     storename = "SQLAlchemy"

tox.ini

@@ -37,7 +37,8 @@ deps =
     git+http://github.com/RDFLib/rdflib#egg=rdflib
     SQLAlchemy
     psycopg2
-    git+https://github.com/davispuh/MySQL-for-Python-3#egg=MySQL-python
+    http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-1.0.10.zip
+    # git+https://github.com/davispuh/MySQL-for-Python-3#egg=MySQL-python
     # lxml
 
 [testenv:py33]
@@ -51,7 +52,8 @@ deps =
     git+http://github.com/RDFLib/rdflib#egg=rdflib
     SQLAlchemy
     psycopg2
-    git+https://github.com/davispuh/MySQL-for-Python-3#egg=MySQL-python
+    http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-1.0.10.zip
+    # git+https://github.com/davispuh/MySQL-for-Python-3#egg=MySQL-python
     # oursql
     # lxml