diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-10-05 04:59:55 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-10-05 04:59:55 +0000 |
| commit | d343aa3022b3f18c89b06766b87bf71dda730afd (patch) | |
| tree | 64af4356bc6649333ac6619dfcc605daa5eb0842 | |
| parent | a8557557118d453e51ead4d7685f863c4c4ef5c9 (diff) | |
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
| -rw-r--r-- | tests/regressiontests/templates/urls.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/regressiontests/templates/urls.py b/tests/regressiontests/templates/urls.py index e02e0defe1..b7320e5295 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<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"), ) |