← Back to branch summary

~ubuntu-branches/ubuntu/quantal/python-django/quantal

« back to all changes in this revision

Viewing changes to tests/regressiontests/urlpatterns_reverse/included_urls2.py

  • Committer: Bazaar Package Importer
  • Author(s): Chris Lamb
  • Date: 2009-07-29 11:26:28 UTC
  • mfrom: (1.1.8 upstream) (4.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20090729112628-pg09ino8sz0sj21t
Tags: 1.1-1
http://bugs.debian.org/538863
* New upstream release.
* Merge from experimental:
  - Ship FastCGI initscript and /etc/default file in python-django's examples
    directory (Closes: #538863)
  - Drop "05_10539-sphinx06-compatibility.diff"; it has been applied
    upstream.
  - Bump Standards-Version to 3.8.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/regressiontests/urlpatterns_reverse/included_urls2.py
 
1
"""
 
2
These URL patterns are included in two different ways in the main urls.py, with
 
3
an extra argument present in one case. Thus, there are two different ways for
 
4
each name to resolve and Django must distinguish the possibilities based on the
 
5
argument list.
 
6
"""
 
7
 
 
8
from django.conf.urls.defaults import *
 
9
from views import empty_view
 
10
 
 
11
urlpatterns = patterns('',
 
12
    url(r'^part/(?P<value>\w+)/$', empty_view, name="part"),
 
13
    url(r'^part2/(?:(?P<value>\w+)/)?$', empty_view, name="part2"),
 
14
)