From 89e7b673d836b6aa1a9586c1319c86ba7b7ea262 Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Mon, 24 Mar 2008 14:02:44 +0000 Subject: [PATCH] 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 --- django/db/backends/mysql/base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py index 697dcd3a67..7782387f41 100644 --- a/django/db/backends/mysql/base.py +++ b/django/db/backends/mysql/base.py @@ -17,7 +17,8 @@ except ImportError, e: version = Database.version_info if (version < (1,2,1) or (version[:3] == (1, 2, 1) and (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.constants import FIELD_TYPE