diff --git a/django/core/urlresolvers.py b/django/core/urlresolvers.py
index 2d999d0de7..5e565f75d6 100644
--- a/django/core/urlresolvers.py
+++ b/django/core/urlresolvers.py
@@ -252,9 +252,9 @@ class RegexURLResolver(object):
except Resolver404, e:
sub_tried = e.args[0].get('tried')
if sub_tried is not None:
- tried.extend([(pattern.regex.pattern + ' ' + t) for t in sub_tried])
+ tried.extend([[pattern] + t for t in sub_tried])
else:
- tried.append(pattern.regex.pattern)
+ tried.append([pattern])
else:
if sub_match:
sub_match_dict = dict([(smart_str(k), v) for k, v in match.groupdict().items()])
@@ -262,7 +262,7 @@ class RegexURLResolver(object):
for k, v in sub_match.kwargs.iteritems():
sub_match_dict[smart_str(k)] = v
return ResolverMatch(sub_match.func, sub_match.args, sub_match_dict, sub_match.url_name, self.app_name or sub_match.app_name, [self.namespace] + sub_match.namespaces)
- tried.append(pattern.regex.pattern)
+ tried.append([pattern])
raise Resolver404({'tried': tried, 'path': new_path})
raise Resolver404({'path' : path})
diff --git a/django/views/debug.py b/django/views/debug.py
index df62dbfbf1..7050ea38fb 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -778,7 +778,12 @@ TECHNICAL_404_TEMPLATE = """
</p>
<ol>
{% for pattern in urlpatterns %}
- <li>{{ pattern }}</li>
+ <li>
+ {% for pat in pattern %}
+ {{ pat.regex.pattern }}
+ {% if forloop.last and pat.name %}[name='{{ pat.name }}']{% endif %}
+ {% endfor %}
+ </li>
{% endfor %}
</ol>
<p>The current URL, <code>{{ request_path|escape }}</code>, didn't match any of these.</p>
diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls.py b/tests/regressiontests/urlpatterns_reverse/included_named_urls.py
new file mode 100644
index 0000000000..b3f7903b41
--- /dev/null
+++ b/tests/regressiontests/urlpatterns_reverse/included_named_urls.py
@@ -0,0 +1,10 @@
+from django.conf.urls.defaults import *
+from views import empty_view
+
+urlpatterns = patterns('',
+ url(r'^$', empty_view, name="named-url3"),
+ url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url4"),
+ url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
+ (r'^included/', include('regressiontests.urlpatterns_reverse.included_named_urls2')),
+)
+
diff --git a/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py b/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py
new file mode 100644
index 0000000000..96c42c3e4d
--- /dev/null
+++ b/tests/regressiontests/urlpatterns_reverse/included_named_urls2.py
@@ -0,0 +1,9 @@
+from django.conf.urls.defaults import *
+from views import empty_view
+
+urlpatterns = patterns('',
+ url(r'^$', empty_view, name="named-url5"),
+ url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url6"),
+ url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
+)
+
diff --git a/tests/regressiontests/urlpatterns_reverse/named_urls.py b/tests/regressiontests/urlpatterns_reverse/named_urls.py
new file mode 100644
index 0000000000..d8a61a106c
--- /dev/null
+++ b/tests/regressiontests/urlpatterns_reverse/named_urls.py
@@ -0,0 +1,9 @@
+from django.conf.urls.defaults import *
+from views import empty_view
+
+urlpatterns = patterns('',
+ url(r'^$', empty_view, name="named-url1"),
+ url(r'^extra/(?P<extra>\w+)/$', empty_view, name="named-url2"),
+ url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view),
+ (r'^included/', include('regressiontests.urlpatterns_reverse.included_named_urls')),
+)
diff --git a/tests/regressiontests/urlpatterns_reverse/tests.py b/tests/regressiontests/urlpatterns_reverse/tests.py
index 008b5700dd..a0b98a88d3 100644
--- a/tests/regressiontests/urlpatterns_reverse/tests.py
+++ b/tests/regressiontests/urlpatterns_reverse/tests.py
@@ -18,7 +18,9 @@ import unittest
from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse, resolve, NoReverseMatch, Resolver404, ResolverMatch
+from django.core.urlresolvers import reverse, resolve, NoReverseMatch,\
+ Resolver404, ResolverMatch,\
+ RegexURLResolver, RegexURLPattern
from django.http import HttpResponseRedirect, HttpResponsePermanentRedirect
from django.shortcuts import redirect
from django.test import TestCase
@@ -172,6 +174,42 @@ class ResolverTests(unittest.TestCase):
self.assertRaises(Resolver404, resolve, 'a')
self.assertRaises(Resolver404, resolve, '\\')
self.assertRaises(Resolver404, resolve, '.')
+
+ def test_404_tried_urls_have_names(self):
+ """
+ Verifies that the list of URLs that come back from a Resolver404
+ exception contains a list in the right format for printing out in
+ the DEBUG 404 page with both the patterns and URL names, if available.
+ """
+ urls = 'regressiontests.urlpatterns_reverse.named_urls'
+ # this list matches the expected URL types and names returned when
+ # you try to resolve a non-existent URL in the first level of included
+ # URLs in named_urls.py (e.g., '/included/non-existent-url')
+ url_types_names = [
+ [{'type': RegexURLPattern, 'name': 'named-url1'}],
+ [{'type': RegexURLPattern, 'name': 'named-url2'}],
+ [{'type': RegexURLPattern, 'name': None}],
+ [{'type': RegexURLResolver}, {'type': RegexURLPattern, 'name': 'named-url3'}],
+ [{'type': RegexURLResolver}, {'type': RegexURLPattern, 'name': 'named-url4'}],
+ [{'type': RegexURLResolver}, {'type': RegexURLPattern, 'name': None}],
+ [{'type': RegexURLResolver}, {'type': RegexURLResolver}],
+ ]
+ try:
+ resolve('/included/non-existent-url', urlconf=urls)
+ self.fail('resolve did not raise a 404')
+ except Resolver404, e:
+ # make sure we at least matched the root ('/') url resolver:
+ self.assertTrue('tried' in e.args[0])
+ tried = e.args[0]['tried']
+ self.assertEqual(len(e.args[0]['tried']), len(url_types_names), 'Wrong number of tried URLs returned. Expected %s, got %s.' % (len(url_types_names), len(e.args[0]['tried'])))
+ for tried, expected in zip(e.args[0]['tried'], url_types_names):
+ for t, e in zip(tried, expected):
+ self.assertTrue(isinstance(t, e['type']), '%s is not an instance of %s' % (t, e['type']))
+ if 'name' in e:
+ if not e['name']:
+ self.assertTrue(t.name is None, 'Expected no URL name but found %s.' % t.name)
+ else:
+ self.assertEqual(t.name, e['name'], 'Wrong URL name. Expected "%s", got "%s".' % (e['name'], t.name))
class ReverseShortcutTests(TestCase):
urls = 'regressiontests.urlpatterns_reverse.urls'