Skip to content

Commit

Permalink
Merge pull request #229 from nephila/feature/mysql
Browse files Browse the repository at this point in the history
Use newer mysql driver
  • Loading branch information
yakky committed Dec 19, 2015
2 parents 5234ece + ffc3800 commit 85587ed
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Libraries you would want to check:
* libjpeg (for JPEG support in ``Pillow``)
* zlib (for PNG support in ``Pillow``)
* postgresql (for ``psycopg2``)
* libmysqlclient (for ``Mysql-Python``)
* libmysqlclient (for ``Mysql``)
* python-dev (for compilation and linking)

For additional information, check http://djangocms-installer.readthedocs.org/en/latest/libraries.html
Expand Down
2 changes: 1 addition & 1 deletion djangocms_installer/config/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
DRIVERS = {
'django.db.backends.postgresql_psycopg2': 'psycopg2',
'django.db.backends.postgresql_postgis': 'postgis',
'django.db.backends.mysql': 'MySQL-python',
'django.db.backends.mysql': 'mysqlclient',
'django.db.backends.sqlite3': '',
}

Expand Down
2 changes: 1 addition & 1 deletion djangocms_installer/install/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def check_install(config_data):
)

# MySQL test
if config_data.db_driver == 'MySQL-python' and not config_data.no_db_driver: # pragma: no cover # NOQA
if config_data.db_driver == 'mysqlclient' and not config_data.no_db_driver: # pragma: no cover # NOQA
try:
import MySQLdb # NOQA
except ImportError:
Expand Down

0 comments on commit 85587ed

Please sign in to comment.