Fixed #18037 -- Changed behaviour of url and ssi template tags to the new syntax, as per official deprecation timeline. Thanks Ramiro Morales and Jannis Leidel for the review.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17934 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 6 insertions, 21 deletions

diff --git a/tests/regressiontests/i18n/patterns/tests.py b/tests/regressiontests/i18n/patterns/tests.py
index d8ca3accd6..e59994a8b0 100644
--- a/tests/regressiontests/i18n/patterns/tests.py
+++ b/tests/regressiontests/i18n/patterns/tests.py
@@ -243,45 +243,30 @@ class URLTagTests(URLTestCaseBase):
     """
     Test if the language tag works.
     """
-    def setUp(self):
-        self.save_warnings_state()
-        warnings.filterwarnings('ignore', category=DeprecationWarning,
-                                module='django.template.defaulttags')
-
-    def tearDown(self):
-        self.restore_warnings_state()
-
     def test_strings_only(self):
         t = Template("""{% load i18n %}
-            {% language 'nl' %}{% url no-prefix-translated %}{% endlanguage %}
-            {% language 'pt-br' %}{% url no-prefix-translated %}{% endlanguage %}""")
+            {% language 'nl' %}{% url 'no-prefix-translated' %}{% endlanguage %}
+            {% language 'pt-br' %}{% url 'no-prefix-translated' %}{% endlanguage %}""")
         self.assertEqual(t.render(Context({})).strip().split(),
                          [u'/vertaald/', u'/traduzidos/'])
 
     def test_context(self):
         ctx = Context({'lang1':'nl', 'lang2':'pt-br'})
         tpl = Template("""{% load i18n %}
-            {% language lang1 %}{% url no-prefix-translated %}{% endlanguage %}
-            {% language lang2 %}{% url no-prefix-translated %}{% endlanguage %}""")
+            {% language lang1 %}{% url 'no-prefix-translated' %}{% endlanguage %}
+            {% language lang2 %}{% url 'no-prefix-translated' %}{% endlanguage %}""")
         self.assertEqual(tpl.render(ctx).strip().split(),
                          [u'/vertaald/', u'/traduzidos/'])
 
     def test_args(self):
         tpl = Template("""{% load i18n %}
-            {% language 'nl' %}{% url no-prefix-translated-slug 'apo' %}{% endlanguage %}
-            {% language 'pt-br' %}{% url no-prefix-translated-slug 'apo' %}{% endlanguage %}""")
+            {% language 'nl' %}{% url 'no-prefix-translated-slug' 'apo' %}{% endlanguage %}
+            {% language 'pt-br' %}{% url 'no-prefix-translated-slug' 'apo' %}{% endlanguage %}""")
         self.assertEqual(tpl.render(Context({})).strip().split(),
                          [u'/vertaald/apo/', u'/traduzidos/apo/'])
 
     def test_kwargs(self):
         tpl = Template("""{% load i18n %}
-            {% language 'nl'  %}{% url no-prefix-translated-slug slug='apo' %}{% endlanguage %}
-            {% language 'pt-br' %}{% url no-prefix-translated-slug slug='apo' %}{% endlanguage %}""")
-        self.assertEqual(tpl.render(Context({})).strip().split(),
-                         [u'/vertaald/apo/', u'/traduzidos/apo/'])
-
-    def test_future_kwargs(self):
-        tpl = Template("""{% load i18n %}{% load url from future %}
             {% language 'nl'  %}{% url 'no-prefix-translated-slug' slug='apo' %}{% endlanguage %}
             {% language 'pt-br' %}{% url 'no-prefix-translated-slug' slug='apo' %}{% endlanguage %}""")
         self.assertEqual(tpl.render(Context({})).strip().split(),