1
0
mirror of https://github.com/django/django.git synced 2024-12-25 02:26:12 +00:00

Altered a failing url template tag test to work more reliably.

There's no guarantee about the order in which ambiguous patterns are resolved.
The solution is "don't do that" and avoid ambiguity.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9113 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-10-05 04:59:55 +00:00
parent a855755711
commit d343aa3022

View File

@ -8,9 +8,9 @@ urlpatterns = patterns('',
(r'^$', views.index), (r'^$', views.index),
(r'^client/(\d+)/$', views.client), (r'^client/(\d+)/$', views.client),
(r'^client/(?P<id>\d+)/(?P<action>[^/]+)/$', views.client_action), (r'^client/(?P<id>\d+)/(?P<action>[^/]+)/$', views.client_action),
url(r'^named-client/(\d+)/$', views.client, name="named.client"), url(r'^named-client/(\d+)/$', views.client2, name="named.client"),
# Unicode strings are permitted everywhere. # Unicode strings are permitted everywhere.
url(ur'^Юникод/(\w+)/$', views.client, name=u"метка_оператора"), url(ur'^Юникод/(\w+)/$', views.client2, name=u"метка_оператора"),
url(ur'^Юникод/(?P<tag>\S+)/$', 'regressiontests.templates.views.client2', name=u"метка_оператора_2"), url(ur'^Юникод/(?P<tag>\S+)/$', 'regressiontests.templates.views.client2', name=u"метка_оператора_2"),
) )