Commit bd930321 authored by Tim Graham's avatar Tim Graham
Browse files

Removed ssi/url tags from future per deprecation timeline; refs #21939.

parent e278407b

django/templatetags/future.py

+1 −19
Original line number Diff line number Diff line
@@ -2,29 +2,11 @@ import warnings 


from django.template import Library

from django.template import defaulttags

from django.utils.deprecation import RemovedInDjango19Warning, RemovedInDjango20Warning

from django.utils.deprecation import RemovedInDjango20Warning



register = Library()





@register.tag

def ssi(parser, token):

    warnings.warn(

        "Loading the `ssi` tag from the `future` library is deprecated and "

        "will be removed in Django 1.9. Use the default `ssi` tag instead.",

        RemovedInDjango19Warning)

    return defaulttags.ssi(parser, token)





@register.tag

def url(parser, token):

    warnings.warn(

        "Loading the `url` tag from the `future` library is deprecated and "

        "will be removed in Django 1.9. Use the default `url` tag instead.",

        RemovedInDjango19Warning)

    return defaulttags.url(parser, token)





@register.tag

def cycle(parser, token):

    """

tests/template_tests/syntax_tests/test_ssi.py

+3 −5
Original line number Diff line number Diff line 
import os



from django.test import ignore_warnings, SimpleTestCase

from django.utils.deprecation import RemovedInDjango19Warning, RemovedInDjango20Warning

from django.utils.deprecation import RemovedInDjango20Warning



from ..utils import ROOT, setup
@@ -32,16 +32,14 @@ class SsiTagTests(SimpleTestCase): 
        self.assertEqual(output, ''),



    # Test passing as a variable

    @ignore_warnings(category=RemovedInDjango19Warning)

    @setup({'ssi04': '{% load ssi from future %}{% ssi ssi_file %}'})

    @setup({'ssi04': '{% ssi ssi_file %}'})

    def test_ssi04(self):

        output = self.engine.render_to_string('ssi04', {

            'ssi_file': os.path.join(ROOT, 'templates', 'ssi_include.html')

        })

        self.assertEqual(output, 'This is for testing an ssi include. {{ test }}\n')



    @ignore_warnings(category=RemovedInDjango19Warning)

    @setup({'ssi05': '{% load ssi from future %}{% ssi ssi_file %}'})

    @setup({'ssi05': '{% ssi ssi_file %}'})

    def test_ssi05(self):

        output = self.engine.render_to_string('ssi05', {'ssi_file': 'no_file'})

        self.assertEqual(output, '')