summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-03-26 15:15:55 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-03-26 15:15:55 +0000
commit7733895382b497771ee48754c19d2f012e475e07 (patch)
tree08ce414f265624e3d12299a59491fe399997da1d /django
parent917fb7c993374cabdde8f041bc4878d271d0ff42 (diff)
[1.1.X] Fixed #12594 -- Ensured that a meaningful exception is raised when the urlconf_module is None. Thanks to buriy for the report and patch.
Backport of r12854 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12855 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
-rw-r--r--django/core/handlers/base.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
index f144ce4bb1..5aabfccaf8 100644
--- a/django/core/handlers/base.py
+++ b/django/core/handlers/base.py
@@ -172,6 +172,9 @@ class BaseHandler(object):
request_repr = "Request repr() unavailable"
message = "%s\n\n%s" % (self._get_traceback(exc_info), request_repr)
mail_admins(subject, message, fail_silently=True)
+ # If Http500 handler is not installed, re-raise last exception
+ if resolver.urlconf_module is None:
+ raise exc_info[1], None, exc_info[2]
# Return an HttpResponse that displays a friendly error message.
callback, param_dict = resolver.resolve500()
return callback(request, **param_dict)