From d343aa3022b3f18c89b06766b87bf71dda730afd Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sun, 5 Oct 2008 04:59:55 +0000 Subject: [PATCH] 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 --- tests/regressiontests/templates/urls.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/regressiontests/templates/urls.py b/tests/regressiontests/templates/urls.py index e02e0defe13..b7320e5295e 100644 --- a/tests/regressiontests/templates/urls.py +++ b/tests/regressiontests/templates/urls.py @@ -8,9 +8,9 @@ urlpatterns = patterns('', (r'^$', views.index), (r'^client/(\d+)/$', views.client), (r'^client/(?P\d+)/(?P[^/]+)/$', 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\S+)/$', 'regressiontests.templates.views.client2', name=u"метка_оператора_2"), )