Ticket #9310: named_404.diff

django/core/urlresolvers.py

@@ -180 +180 @@
                 try:
                     sub_match = pattern.resolve(new_path)
                 except Resolver404, e:
-                    tried.extend([(pattern.regex.pattern + '   ' + t) for t in e.args[0]['tried']])
+                    tried.extend([pattern] + t for t in e.args[0]['tried'])
                 else:
                     if sub_match:
                         sub_match_dict = dict([(smart_str(k), v) for k, v in match.groupdict().items()])
@@ -188 +188 @@
                         for k, v in sub_match[2].iteritems():
                             sub_match_dict[smart_str(k)] = v
                         return sub_match[0], sub_match[1], sub_match_dict
-                    tried.append(pattern.regex.pattern)
+                    tried.append([pattern])
             raise Resolver404, {'tried': tried, 'path': new_path}
 
     def _get_urlconf_module(self):

django/views/debug.py

@@ -729 +729 @@
       </p>
       <ol>
         {% for pattern in urlpatterns %}
-          <li>{{ pattern }}</li>
+          <li>{% for pat in pattern %}
+            {{ pat.regex.pattern }} {% if 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>