From dc378e8ca7fd099ebf6fda37503db172d445c6d4 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Fri, 26 May 2006 19:02:23 +0000 Subject: [PATCH] Improved error message if DATABASE_ENGINE is invalid. git-svn-id: http://code.djangoproject.com/svn/django/trunk@2994 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/django/db/__init__.py b/django/db/__init__.py index 317d6059bf..f21ae6a727 100644 --- a/django/db/__init__.py +++ b/django/db/__init__.py @@ -17,8 +17,11 @@ except ImportError, e: backend_dir = os.path.join(__path__[0], 'backends') available_backends = [f for f in os.listdir(backend_dir) if not f.startswith('_') and not f.startswith('.') and not f.endswith('.py') and not f.endswith('.pyc')] available_backends.sort() - raise ImproperlyConfigured, "Could not load database backend: %s. Is your DATABASE_ENGINE setting (currently, %r) spelled correctly? Available options are: %s" % \ - (e, settings.DATABASE_ENGINE, ", ".join(map(repr, available_backends))) + if settings.DATABASE_ENGINE not in available_backends: + raise ImproperlyConfigured, "%r isn't an available database backend. vailable options are: %s" % \ + (settings.DATABASE_ENGINE, ", ".join(map(repr, available_backends))) + else: + raise # If there's some other error, this must be an error in Django itself. get_introspection_module = lambda: __import__('django.db.backends.%s.introspection' % settings.DATABASE_ENGINE, '', '', ['']) get_creation_module = lambda: __import__('django.db.backends.%s.creation' % settings.DATABASE_ENGINE, '', '', [''])