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

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:
Russell Keith-Magee 2010-10-08 13:56:54 +00:00
parent f53491db6e
commit 515b4d3aa8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/utils.py
View File

@ -111,9 +111,11 @@ class ConnectionRouter(object):
except ImportError, e: except ImportError, e:
raise ImproperlyConfigured('Error importing database router %s: "%s"' % (klass_name, e)) raise ImproperlyConfigured('Error importing database router %s: "%s"' % (klass_name, e))
try: try:
router = getattr(module, klass_name)() router_class = getattr(module, klass_name)
except AttributeError: except AttributeError:
raise ImproperlyConfigured('Module "%s" does not define a database router name "%s"' % (module, klass_name)) raise ImproperlyConfigured('Module "%s" does not define a database router name "%s"' % (module, klass_name))
else:
router = router_class()
else: else:
router = r router = r
self.routers.append(router) self.routers.append(router)