Browse files

[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
  • Loading branch information...
1 parent b7f4009 commit e4bc9e1f4aba25b4c0d31dbd9814414d4b5f0928 @malcolmt malcolmt committed Oct 5, 2008
Showing with 2 additions and 2 deletions.
  1. +2 −2 tests/regressiontests/templates/urls.py
View
4 tests/regressiontests/templates/urls.py
@@ -8,9 +8,9 @@
(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"),
)

0 comments on commit e4bc9e1

Please sign in to comment.