Fixed #14381 -- Clarified exception handling when instantiating Routers. Thanks to dauerbaustelle for the suggestion and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
f53491db6e
commit
515b4d3aa8
|
@ -111,9 +111,11 @@ class ConnectionRouter(object):
|
|||
except ImportError, e:
|
||||
raise ImproperlyConfigured('Error importing database router %s: "%s"' % (klass_name, e))
|
||||
try:
|
||||
router = getattr(module, klass_name)()
|
||||
router_class = getattr(module, klass_name)
|
||||
except AttributeError:
|
||||
raise ImproperlyConfigured('Module "%s" does not define a database router name "%s"' % (module, klass_name))
|
||||
else:
|
||||
router = router_class()
|
||||
else:
|
||||
router = r
|
||||
self.routers.append(router)
|
||||
|
|
Loading…
Reference in New Issue