summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--django/views/debug.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/django/views/debug.py b/django/views/debug.py
index cff199ddb4..29291c0bf6 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -537,11 +537,13 @@ def technical_404_response(request, exception):
urlconf = urlconf.__name__
caller = ''
- try:
- resolver_match = resolve(request.path)
- except Http404:
- pass
- else:
+ resolver_match = request.resolver_match
+ if resolver_match is None:
+ try:
+ resolver_match = resolve(request.path)
+ except Http404:
+ pass
+ if resolver_match is not None:
obj = resolver_match.func
if hasattr(obj, 'view_class'):