Commit d343aa30 authored by Malcolm Tredinnick's avatar Malcolm Tredinnick
Browse files

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
parent a8557557

tests/regressiontests/templates/urls.py

+2 −2
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ urlpatterns = patterns('', 
    (r'^$', views.index),

    (r'^client/(\d+)/$', views.client),

    (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.

    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"),

)