diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-10-05 05:02:55 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-10-05 05:02:55 +0000 |
| commit | e4bc9e1f4aba25b4c0d31dbd9814414d4b5f0928 (patch) | |
| tree | a712e0ab74b53c9d58f34614a85c239c5de39c60 /tests | |
| parent | b7f40091ade38099fd63671c2b1db7044eda1c3b (diff) | |
[1.0.X] 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.
This is a port of r9113 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9114 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
| -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"), ) |