mirror of
https://github.com/django/django.git
synced 2024-12-24 10:05:46 +00:00
37ee86b7ee
This is a similar situation to that fixed in r9087. We weren't merging multiple levels of include() calls together correctly. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
14 lines
481 B
Python
14 lines
481 B
Python
"""
|
|
Some extra URL patterns that are included at the top level.
|
|
"""
|
|
|
|
from django.conf.urls.defaults import *
|
|
from views import empty_view
|
|
|
|
urlpatterns = patterns('',
|
|
url(r'^e-places/(\d+)/$', empty_view, name='extra-places'),
|
|
url(r'^e-people/(?P<name>\w+)/$', empty_view, name="extra-people"),
|
|
url('', include('regressiontests.urlpatterns_reverse.included_urls2')),
|
|
url(r'^prefix/(?P<prefix>\w+)/', include('regressiontests.urlpatterns_reverse.included_urls2')),
|
|
)
|