Changeset 8760

Timestamp:

08/31/08 06:11:20 (3 months ago)

Author:

mtredinnick

Message:

A rewrite of the reverse URL parsing: the reverse() call and the "url" template tag.

This is fully backwards compatible, but it fixes a bunch of little bugs. Thanks
to SmileyChris? and Ilya Semenov for some early patches in this area that were
incorporated into this change.

Fixed #2977, #4915, #6934, #7206.

Files:

• django/trunk/django/core/urlresolvers.py (modified) (6 diffs)
• django/trunk/django/utils/regex_helper.py (added)
• django/trunk/docs/topics/http/urls.txt (modified) (1 diff)
• django/trunk/tests/regressiontests/templates/tests.py (modified) (1 diff)
• django/trunk/tests/regressiontests/urlpatterns_reverse/included_urls.py (added)
• django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py (modified) (2 diffs)
• django/trunk/tests/regressiontests/urlpatterns_reverse/urls.py (added)
• django/trunk/tests/regressiontests/urlpatterns_reverse/views.py (added)

django/trunk/django/core/urlresolvers.py

@@ -14 +14 @@
-from django.utils.encoding import iri_to_uri, force_unicode, smart_str
-from django.utils.functional import memoize
+from django.utils.regex_helper import normalize
-from django.utils.thread_support import currentThread
-
@@ -20 +21 @@
-except NameError:
-    from django.utils.itercompat import reversed     # Python 2.3 fallback
+    from sets import Set as set
-
-_resolver_cache = {} # Maps urlconf modules to RegexURLResolver instances.
@@ -79 +81 @@
-    return callback[:dot], callback[dot+1:]
-
-def reverse_helper(regex, *args, **kwargs):
-    """
-    Does a "reverse" lookup -- returns the URL for the given args/kwargs.
-    The args/kwargs are applied to the given compiled regular expression.
-    For example:
-
-        >>> reverse_helper(re.compile('^places/(\d+)/$'), 3)
-        'places/3/'
-        >>> reverse_helper(re.compile('^places/(?P<id>\d+)/$'), id=3)
-        'places/3/'
-        >>> reverse_helper(re.compile('^people/(?P<state>\w\w)/(\w+)/$'), 'adrian', state='il')
-        'people/il/adrian/'
-
-    Raises NoReverseMatch if the args/kwargs aren't valid for the regex.
-    """
-    # TODO: Handle nested parenthesis in the following regex.
-    result = re.sub(r'\(([^)]+)\)', MatchChecker(args, kwargs), regex.pattern)
-    return result.replace('^', '').replace('$', '').replace('\\', '')
-
-class MatchChecker(object):
-    "Class used in reverse RegexURLPattern lookup."
-    def __init__(self, args, kwargs):
-        self.args, self.kwargs = args, kwargs
-        self.current_arg = 0
-
-    def __call__(self, match_obj):
-        # match_obj.group(1) is the contents of the parenthesis.
-        # First we need to figure out whether it's a named or unnamed group.
-        #
-        grouped = match_obj.group(1)
-        m = re.search(r'^\?P<(\w+)>(.*?)$', grouped, re.UNICODE)
-        if m: # If this was a named group...
-            # m.group(1) is the name of the group
-            # m.group(2) is the regex.
-            try:
-                value = self.kwargs[m.group(1)]
-            except KeyError:
-                # It was a named group, but the arg was passed in as a
-                # positional arg or not at all.
-                try:
-                    value = self.args[self.current_arg]
-                    self.current_arg += 1
-                except IndexError:
-                    # The arg wasn't passed in.
-                    raise NoReverseMatch('Not enough positional arguments passed in')
-            test_regex = m.group(2)
-        else: # Otherwise, this was a positional (unnamed) group.
-            try:
-                value = self.args[self.current_arg]
-                self.current_arg += 1
-            except IndexError:
-                # The arg wasn't passed in.
-                raise NoReverseMatch('Not enough positional arguments passed in')
-            test_regex = grouped
-        # Note we're using re.match here on purpose because the start of
-        # to string needs to match.
-        if not re.match(test_regex + '$', force_unicode(value), re.UNICODE):
-            raise NoReverseMatch("Value %r didn't match regular expression %r" % (value, test_regex))
-        return force_unicode(value)
-
-class RegexURLPattern(object):
-    def __init__(self, regex, callback, default_args=None, name=None):
@@ -195 +137 @@
-    callback = property(_get_callback)
-
-    def reverse(self, viewname, *args, **kwargs):
-        mod_name, func_name = get_mod_func(viewname)
-        try:
-            lookup_view = getattr(__import__(mod_name, {}, {}, ['']), func_name)
-        except ImportError, e:
-            raise NoReverseMatch("Could not import '%s': %s" % (mod_name, e))
-        except AttributeError, e:
-            raise NoReverseMatch("'%s' has no attribute '%s'" % (mod_name, func_name))
-        if lookup_view != self.callback:
-            raise NoReverseMatch("Reversed view '%s' doesn't match the expected callback ('%s')." % (viewname, self.callback))
-        return self.reverse_helper(*args, **kwargs)
-
-    def reverse_helper(self, *args, **kwargs):
-        return reverse_helper(self.regex, *args, **kwargs)
-
-class RegexURLResolver(object):
-    def __init__(self, regex, urlconf_name, default_kwargs=None):
@@ -226 +153 @@
-        if not self._reverse_dict and hasattr(self.urlconf_module, 'urlpatterns'):
-            for pattern in reversed(self.urlconf_module.urlpatterns):
+                p_pattern = pattern.regex.pattern
+                if p_pattern.startswith('^'):
+                    p_pattern = p_pattern[1:]
-                if isinstance(pattern, RegexURLResolver):
-
-
+
+
+
+
+
+
+
-                else:
-
-
+
+
+
-        return self._reverse_dict
-    reverse_dict = property(_get_reverse_dict)
@@ -282 +218 @@
-
-    def reverse(self, lookup_view, *args, **kwargs):
+        if args and kwargs:
+            raise ValueError("Don't mix *args and **kwargs in call to reverse()!")
-        try:
-            lookup_view = get_callable(lookup_view, True)
-        except (ImportError, AttributeError), e:
-            raise NoReverseMatch("Error importing '%s': %s." % (lookup_view, e))
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        raise NoReverseMatch("Reverse for '%s' with arguments '%s' and keyword "
-                "arguments '%s' not found." % (lookup_view, args, kwargs))
-
-    def reverse_helper(self, lookup_view, *args, **kwargs):
-        sub_match = self.reverse(lookup_view, *args, **kwargs)
-        result = reverse_helper(self.regex, *args, **kwargs)
-        return result + sub_match
-
-def resolve(path, urlconf=None):

django/trunk/docs/topics/http/urls.txt

@@ -613 +613 @@
-.. _URL pattern name: `Naming URL patterns`_
-
+The ``reverse()`` function can reverse a large variety of regular expression
+patterns for URLs, but not every possible one. The main restriction at the
+moment is that the pattern cannot contain alternative choices using the
+vertical bar (``"|"``) character. You can quite happily use such patterns for
+matching against incoming URLs and sending them off to views, but you cannot
+reverse such patterns.
+
-permalink()
------------

django/trunk/tests/regressiontests/templates/tests.py

@@ -887 +887 @@
-            # Successes
-            'url01': ('{% url regressiontests.templates.views.client client.id %}', {'client': {'id': 1}}, '/url_tag/client/1/'),
-
+
+
-            'url03': ('{% url regressiontests.templates.views.index %}', {}, '/url_tag/'),
-            'url04': ('{% url named.client client.id %}', {'client': {'id': 1}}, '/url_tag/named-client/1/'),

django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py

@@ -1 @@
-
+
+
+
-
-_helper
-
+
+
-
-test_data = (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-)
-
-
+
+
+
-    def test_urlpattern_reverse(self):
-regex
+name
-            try:
-_helper(re.compile(regex), *args, **
+(name, args=args, kwargs=
-            except NoReverseMatch, e:
-                self.assertEqual(expected, NoReverseMatch)
@@ -37 +76 @@
-                self.assertEquals(got, expected)
-
-if __name__ == "__main__":
-    run_tests(1)