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.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8760 bcc190cf-cafb-0310-a4f2-bffc1f526a37

4 files changed, 121 insertions, 28 deletions

diff --git a/tests/regressiontests/urlpatterns_reverse/included_urls.py b/tests/regressiontests/urlpatterns_reverse/included_urls.py
new file mode 100644
index 0000000000..f8acf342f2
--- /dev/null
+++ b/tests/regressiontests/urlpatterns_reverse/included_urls.py
@@ -0,0 +1,8 @@
+from django.conf.urls.defaults import *
+from views import empty_view
+
+urlpatterns = patterns('',
+    url(r'^$', empty_view, name="inner-nothing"),
+    url(r'^extra/(?P<extra>\w+)/$', empty_view, name="inner-extra"),
+    url(r'^(?P<one>\d+)|(?P<two>\d+)/$', empty_view, name="inner-disjunction"),
+)
diff --git a/tests/regressiontests/urlpatterns_reverse/tests.py b/tests/regressiontests/urlpatterns_reverse/tests.py
index 610c3f7bc7..fbea3cb570 100644
--- a/tests/regressiontests/urlpatterns_reverse/tests.py
+++ b/tests/regressiontests/urlpatterns_reverse/tests.py
@@ -1,40 +1,77 @@
-"Unit tests for reverse URL lookup"
+"""
+Unit tests for reverse URL lookups.
+"""
 
-from django.core.urlresolvers import reverse_helper, NoReverseMatch
-import re, unittest
+from django.core.urlresolvers import reverse, NoReverseMatch
+from django.test import TestCase
 
 test_data = (
-    ('^places/(\d+)/$', 'places/3/', [3], {}),
-    ('^places/(\d+)/$', 'places/3/', ['3'], {}),
-    ('^places/(\d+)/$', NoReverseMatch, ['a'], {}),
-    ('^places/(\d+)/$', NoReverseMatch, [], {}),
-    ('^places/(?P<id>\d+)/$', 'places/3/', [], {'id': 3}),
-    ('^people/(?P<name>\w+)/$', 'people/adrian/', ['adrian'], {}),
-    ('^people/(?P<name>\w+)/$', 'people/adrian/', [], {'name': 'adrian'}),
-    ('^people/(?P<name>\w+)/$', NoReverseMatch, ['name with spaces'], {}),
-    ('^people/(?P<name>\w+)/$', NoReverseMatch, [], {'name': 'name with spaces'}),
-    ('^people/(?P<name>\w+)/$', NoReverseMatch, [], {}),
-    ('^hardcoded/$', 'hardcoded/', [], {}),
-    ('^hardcoded/$', 'hardcoded/', ['any arg'], {}),
-    ('^hardcoded/$', 'hardcoded/', [], {'kwarg': 'foo'}),
-    ('^hardcoded/doc\\.pdf$', 'hardcoded/doc.pdf', [], {}),
-    ('^people/(?P<state>\w\w)/(?P<name>\w+)/$', 'people/il/adrian/', [], {'state': 'il', 'name': 'adrian'}),
-    ('^people/(?P<state>\w\w)/(?P<name>\d)/$', NoReverseMatch, [], {'state': 'il', 'name': 'adrian'}),
-    ('^people/(?P<state>\w\w)/(?P<name>\w+)/$', NoReverseMatch, [], {'state': 'il'}),
-    ('^people/(?P<state>\w\w)/(?P<name>\w+)/$', NoReverseMatch, [], {'name': 'adrian'}),
-    ('^people/(?P<state>\w\w)/(\w+)/$', NoReverseMatch, ['il'], {'name': 'adrian'}),
-    ('^people/(?P<state>\w\w)/(\w+)/$', 'people/il/adrian/', ['adrian'], {'state': 'il'}),
+    ('places', '/places/3/', [3], {}),
+    ('places', '/places/3/', ['3'], {}),
+    ('places', NoReverseMatch, ['a'], {}),
+    ('places', NoReverseMatch, [], {}),
+    ('places?', '/place/', [], {}),
+    ('places+', '/places/', [], {}),
+    ('places*', '/place/', [], {}),
+    ('places2?', '/', [], {}),
+    ('places2+', '/places/', [], {}),
+    ('places2*', '/', [], {}),
+    ('places3', '/places/4/', [4], {}),
+    ('places3', '/places/harlem/', ['harlem'], {}),
+    ('places3', NoReverseMatch, ['harlem64'], {}),
+    ('places4', '/places/3/', [], {'id': 3}),
+    ('people', NoReverseMatch, [], {}),
+    ('people', '/people/adrian/', ['adrian'], {}),
+    ('people', '/people/adrian/', [], {'name': 'adrian'}),
+    ('people', NoReverseMatch, ['name with spaces'], {}),
+    ('people', NoReverseMatch, [], {'name': 'name with spaces'}),
+    ('people2', '/people/name/', [], {}),
+    ('people2a', '/people/name/fred/', ['fred'], {}),
+    ('optional', '/optional/fred/', [], {'name': 'fred'}),
+    ('optional', '/optional/fred/', ['fred'], {}),
+    ('hardcoded', '/hardcoded/', [], {}),
+    ('hardcoded2', '/hardcoded/doc.pdf', [], {}),
+    ('people3', '/people/il/adrian/', [], {'state': 'il', 'name': 'adrian'}),
+    ('people3', NoReverseMatch, [], {'state': 'il'}),
+    ('people3', NoReverseMatch, [], {'name': 'adrian'}),
+    ('people4', NoReverseMatch, [], {'state': 'il', 'name': 'adrian'}),
+    ('people6', '/people/il/test/adrian/', ['il/test', 'adrian'], {}),
+    ('people6', '/people//adrian/', ['adrian'], {}),
+    ('range', '/character_set/a/', [], {}),
+    ('range2', '/character_set/x/', [], {}),
+    ('price', '/price/$10/', ['10'], {}),
+    ('price2', '/price/$10/', ['10'], {}),
+    ('price3', '/price/$10/', ['10'], {}),
+    ('product', '/product/chocolate+($2.00)/', [], {'price': '2.00', 'product': 'chocolate'}),
+    ('headlines', '/headlines/2007.5.21/', [], dict(year=2007, month=5, day=21)),
+    ('windows', r'/windows_path/C:%5CDocuments%20and%20Settings%5Cspam/', [], dict(drive_name='C', path=r'Documents and Settings\spam')),
+    ('special', r'/special_chars/+%5C$*/', [r'+\$*'], {}),
+    ('special', NoReverseMatch, [''], {}),
+    ('mixed', '/john/0/', [], {'name': 'john'}),
+    ('repeats', '/repeats/a/', [], {}),
+    ('repeats2', '/repeats/aa/', [], {}),
+    ('insensitive', '/CaseInsensitive/fred', ['fred'], {}),
+    ('test', '/test/1', [], {}),
+    ('test2', '/test/2', [], {}),
+    ('inner-nothing', '/outer/42/', [], {'outer': '42'}),
+    ('inner-nothing', '/outer/42/', ['42'], {}),
+    ('inner-nothing', NoReverseMatch, ['foo'], {}),
+    ('inner-extra', '/outer/42/extra/inner/', [], {'extra': 'inner', 'outer': '42'}),
+    ('inner-extra', '/outer/42/extra/inner/', ['42', 'inner'], {}),
+    ('inner-extra', NoReverseMatch, ['fred', 'inner'], {}),
+    ('disjunction', NoReverseMatch, ['foo'], {}),
+    ('inner-disjunction', NoReverseMatch, ['10', '11'], {}),
 )
 
-class URLPatternReverse(unittest.TestCase):
+class URLPatternReverse(TestCase):
+    urls = 'regressiontests.urlpatterns_reverse.urls'
+
     def test_urlpattern_reverse(self):
-        for regex, expected, args, kwargs in test_data:
+        for name, expected, args, kwargs in test_data:
             try:
-                got = reverse_helper(re.compile(regex), *args, **kwargs)
+                got = reverse(name, args=args, kwargs=kwargs)
             except NoReverseMatch, e:
                 self.assertEqual(expected, NoReverseMatch)
             else:
                 self.assertEquals(got, expected)
 
-if __name__ == "__main__":
-    run_tests(1)
diff --git a/tests/regressiontests/urlpatterns_reverse/urls.py b/tests/regressiontests/urlpatterns_reverse/urls.py
new file mode 100644
index 0000000000..21f2ddafb7
--- /dev/null
+++ b/tests/regressiontests/urlpatterns_reverse/urls.py
@@ -0,0 +1,46 @@
+from django.conf.urls.defaults import *
+from views import empty_view
+
+urlpatterns = patterns('',
+    url(r'^places/(\d+)/$', empty_view, name='places'),
+    url(r'^places?/$', empty_view, name="places?"),
+    url(r'^places+/$', empty_view, name="places+"),
+    url(r'^places*/$', empty_view, name="places*"),
+    url(r'^(?:places/)?$', empty_view, name="places2?"),
+    url(r'^(?:places/)+$', empty_view, name="places2+"),
+    url(r'^(?:places/)*$', empty_view, name="places2*"),
+    url(r'^places/(\d+|[a-z_]+)/', empty_view, name="places3"),
+    url(r'^places/(?P<id>\d+)/$', empty_view, name="places4"),
+    url(r'^people/(?P<name>\w+)/$', empty_view, name="people"),
+    url(r'^people/(?:name/)', empty_view, name="people2"),
+    url(r'^people/(?:name/(\w+)/)?', empty_view, name="people2a"),
+    url(r'^optional/(?P<name>.*)/(?:.+/)?', empty_view, name="optional"),
+    url(r'^hardcoded/$', 'hardcoded/', empty_view, name="hardcoded"),
+    url(r'^hardcoded/doc\.pdf$', empty_view, name="hardcoded2"),
+    url(r'^people/(?P<state>\w\w)/(?P<name>\w+)/$', empty_view, name="people3"),
+    url(r'^people/(?P<state>\w\w)/(?P<name>\d)/$', empty_view, name="people4"),
+    url(r'^people/((?P<state>\w\w)/test)?/(\w+)/$', empty_view, name="people6"),
+    url(r'^character_set/[abcdef0-9]/$', empty_view, name="range"),
+    url(r'^character_set/[\w]/$', empty_view, name="range2"),
+    url(r'^price/\$(\d+)/$', empty_view, name="price"),
+    url(r'^price/[$](\d+)/$', empty_view, name="price2"),
+    url(r'^price/[\$](\d+)/$', empty_view, name="price3"),
+    url(r'^product/(?P<product>\w+)\+\(\$(?P<price>\d+(\.\d+)?)\)/$',
+            empty_view, name="product"),
+    url(r'^headlines/(?P<year>\d+)\.(?P<month>\d+)\.(?P<day>\d+)/$', empty_view,
+            name="headlines"),
+    url(r'^windows_path/(?P<drive_name>[A-Z]):\\(?P<path>.+)/$', empty_view,
+            name="windows"),
+    url(r'^special_chars/(.+)/$', empty_view, name="special"),
+    url(r'^(?P<name>.+)/\d+/$', empty_view, name="mixed"),
+    url(r'^repeats/a{1,2}/$', empty_view, name="repeats"),
+    url(r'^repeats/a{2,4}/$', empty_view, name="repeats2"),
+    url(r'^(?i)CaseInsensitive/(\w+)', empty_view, name="insensitive"),
+    url(r'^test/1/?', empty_view, name="test"),
+    url(r'^(?i)test/2/?$', empty_view, name="test2"),
+    url(r'^outer/(?P<outer>\d+)/',
+            include('regressiontests.urlpatterns_reverse.included_urls')),
+
+    # This is non-reversible, but we shouldn't blow up when parsing it.
+    url(r'^(?:foo|bar)(\w+)/$', empty_view, name="disjunction"),
+)
diff --git a/tests/regressiontests/urlpatterns_reverse/views.py b/tests/regressiontests/urlpatterns_reverse/views.py
new file mode 100644
index 0000000000..65be705023
--- /dev/null
+++ b/tests/regressiontests/urlpatterns_reverse/views.py
@@ -0,0 +1,2 @@
+def empty_view(request, *args, **kwargs):
+    pass