Ticket #4915: django-smarter-resolver-2.patch

django/core/urlresolvers.py

@@ -145 +145 @@
-        self.name = name
-
-    def __repr__(self):
-self.name, self.regex.pattern
+repr(self.name), repr(self.regex.pattern)
-
-    def add_prefix(self, prefix):
-        """
@@ -209 +209 @@
-        self._reverse_dict = {}
-
-    def __repr__(self):
-self.regex.pattern
+repr(self.regex.pattern)
-
-    def _get_reverse_dict(self):
+        def _add(key, val):
+            self._reverse_dict.setdefault(key, []).append(val)
-        if not self._reverse_dict and hasattr(self.urlconf_module, 'urlpatterns'):
-            for pattern in reversed(self.urlconf_module.urlpatterns):
-                if isinstance(pattern, RegexURLResolver):
-
-
+
+
+
-                else:
-
-
+
+
+
-        return self._reverse_dict
-    reverse_dict = property(_get_reverse_dict)
-
@@ -274 +278 @@
-        return self._resolve_special('500')
-
-    def reverse(self, lookup_view, *args, **kwargs):
+        # To compare results, we have to coerce all the values into Unicode
+        # (to match the behavior of MatchChecker)
+        args = tuple(map(force_unicode, args))
+        kwargs = dict([(key, force_unicode(val)) for key, val in kwargs.items()])
-        try:
-            lookup_view = get_callable(lookup_view, True)
-        except (ImportError, AttributeError):
-            raise NoReverseMatch
-
-
+
+
+
+
+
+
+
+
+
-        raise NoReverseMatch
-
-    def reverse_helper(self, lookup_view, *args, **kwargs):

tests/regressiontests/templates/tests.py

@@ -732 +732 @@
-            ### URL TAG ########################################################
-            # Successes
-            'url01' : ('{% url regressiontests.templates.views.client client.id %}', {'client': {'id': 1}}, '/url_tag/client/1/'),
-_action client.id,
+ client.id
-            'url03' : ('{% url regressiontests.templates.views.index %}', {}, '/url_tag/'),
-            'url04' : ('{% url named.client client.id %}', {'client': {'id': 1}}, '/url_tag/named-client/1/'),
-            'url05' : (u'{% url метка_оператора v %}', {'v': u'Ω'},

tests/regressiontests/templates/urls.py

@@ -7 +7 @@
-    # Test urls for testing reverse lookups
-    (r'^$', views.index),
-    (r'^client/(\d+)/$', views.client),
-_action
+
-    url(r'^named-client/(\d+)/$', views.client, name="named.client"),
-
-    # Unicode strings are permitted everywhere.