p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #5531 -- Changes a while back meant we are handling import errors from 

database backends differently now. Which meant the MySQLdb version check was
being swallowed. Changed the exception type to ensure this is percolated
correctly. Patch from Ramiro Morales.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7358 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-03-24 14:02:44 +00:00
parent a9a70bfe55
commit 89e7b673d8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/db/backends/mysql/base.py
View File

@ -17,7 +17,8 @@ except ImportError, e:
version = Database.version_info version = Database.version_info
if (version < (1,2,1) or (version[:3] == (1, 2, 1) and if (version < (1,2,1) or (version[:3] == (1, 2, 1) and
(len(version) < 5 or version[3] != 'final' or version[4] < 2))): (len(version) < 5 or version[3] != 'final' or version[4] < 2))):
raise ImportError("MySQLdb-1.2.1p2 or newer is required; you have %s" % Database.__version__) from django.core.exceptions import ImproperlyConfigured
raise ImproperlyConfigured("MySQLdb-1.2.1p2 or newer is required; you have %s" % Database.__version__)
from MySQLdb.converters import conversions from MySQLdb.converters import conversions
from MySQLdb.constants import FIELD_TYPE from MySQLdb.constants import FIELD_TYPE