Fixed #5732 -- Catch all possible errors when importing a URLConf file. This

leads to error messages that contain the name of the problem file (useful when
the problem is part of an include() import).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6584 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-10-21 17:51:06 +00:00
parent 3ec6568e64
commit a1496b054a
1 changed files with 3 additions and 2 deletions

View File

@ -249,8 +249,9 @@ class RegexURLResolver(object):
except AttributeError: except AttributeError:
try: try:
self._urlconf_module = __import__(self.urlconf_name, {}, {}, ['']) self._urlconf_module = __import__(self.urlconf_name, {}, {}, [''])
except ValueError, e: except Exception, e:
# Invalid urlconf_name, such as "foo.bar." (note trailing period) # Either an invalid urlconf_name, such as "foo.bar.", or some
# kind of problem during the actual import.
raise ImproperlyConfigured, "Error while importing URLconf %r: %s" % (self.urlconf_name, e) raise ImproperlyConfigured, "Error while importing URLconf %r: %s" % (self.urlconf_name, e)
return self._urlconf_module return self._urlconf_module
urlconf_module = property(_get_urlconf_module) urlconf_module = property(_get_urlconf_module)