Ticket #14772: 14772.2.diff

File 14772.2.diff, 1.9 KB (added by Rob Hudson, 13 years ago)
  • tests/regressiontests/urlpatterns_reverse/tests.py

    diff --git a/tests/regressiontests/urlpatterns_reverse/tests.py b/tests/regressiontests/urlpatterns_reverse/tests.py
    index 140a6bb..4b9f787 100644
    a b test_data = (  
    7474    ('people2a', '/people/name/fred/', ['fred'], {}),
    7575    ('optional', '/optional/fred/', [], {'name': 'fred'}),
    7676    ('optional', '/optional/fred/', ['fred'], {}),
     77    ('named_optional', '/optional/1/', [1], {}),
     78    ('named_optional', '/optional/1/', [], {'arg1':1}),
     79    ('named_optional', '/optional/1/2/', [1,2], {}),
     80    ('named_optional', '/optional/1/2/', [], {'arg1':1,'arg2':2}),
     81    ('named_optional_terminated', '/optional/1/2/', [1,2], {}),
     82    ('named_optional_terminated', '/optional/1/2/', [], {'arg1':1,'arg2':2}),
    7783    ('hardcoded', '/hardcoded/', [], {}),
    7884    ('hardcoded2', '/hardcoded/doc.pdf', [], {}),
    7985    ('people3', '/people/il/adrian/', [], {'state': 'il', 'name': 'adrian'}),
  • tests/regressiontests/urlpatterns_reverse/urls.py

    diff --git a/tests/regressiontests/urlpatterns_reverse/urls.py b/tests/regressiontests/urlpatterns_reverse/urls.py
    index c603c02..d0d3a8e 100644
    a b urlpatterns = patterns('',  
    1919    url(r'^people/(?:name/)', empty_view, name="people2"),
    2020    url(r'^people/(?:name/(\w+)/)?', empty_view, name="people2a"),
    2121    url(r'^optional/(?P<name>.*)/(?:.+/)?', empty_view, name="optional"),
     22    url(r'^optional/(?P<arg1>\d+)/(?:(?P<arg2>\d+)/)?', absolute_kwargs_view, name="named_optional"),
     23    url(r'^optional/(?P<arg1>\d+)/(?:(?P<arg2>\d+)/)?$', absolute_kwargs_view, name="named_optional_terminated"),
    2224    url(r'^hardcoded/$', 'hardcoded/', empty_view, name="hardcoded"),
    2325    url(r'^hardcoded/doc\.pdf$', empty_view, name="hardcoded2"),
    2426    url(r'^people/(?P<state>\w\w)/(?P<name>\w+)/$', empty_view, name="people3"),
Back to Top