Commit c0c1bb9e authored by Aymeric Augustin's avatar Aymeric Augustin
Browse files

Avoided using private API get_template_from_string.

parent f2ddc439

django/contrib/webdesign/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ from __future__ import unicode_literals 


import unittest



from django.template import loader, Context

from django.template import Context, Template





class WebdesignTest(unittest.TestCase):



    def test_lorem_tag(self):

        t = loader.get_template_from_string("{% load webdesign %}{% lorem 3 w %}")

        t = Template("{% load webdesign %}{% lorem 3 w %}")

        self.assertEqual(t.render(Context({})),

                         'lorem ipsum dolor')

tests/staticfiles_tests/tests.py

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import shutil 
import sys

import unittest



from django.template import loader, Context

from django.template import Context, Template

from django.conf import settings

from django.core.cache.backends.base import BaseCache

from django.core.exceptions import ImproperlyConfigured
@@ -97,7 +97,7 @@ class BaseStaticFilesTestCase(object): 


    def render_template(self, template, **kwargs):

        if isinstance(template, six.string_types):

            template = loader.get_template_from_string(template)

            template = Template(template)

        return template.render(Context(kwargs)).strip()



    def static_template_snippet(self, path, asvar=False):

tests/template_tests/test_nodelist.py

+6 −11
Original line number Diff line number Diff line 
from unittest import TestCase



from django.template import VariableNode, Context

from django.template.loader import get_template_from_string

from django.template import Context, Template, VariableNode

from django.test import override_settings





class NodelistTest(TestCase):



    def test_for(self):

        source = '{% for i in 1 %}{{ a }}{% endfor %}'

        template = get_template_from_string(source)

        template = Template('{% for i in 1 %}{{ a }}{% endfor %}')

        vars = template.nodelist.get_nodes_by_type(VariableNode)

        self.assertEqual(len(vars), 1)



    def test_if(self):

        source = '{% if x %}{{ a }}{% endif %}'

        template = get_template_from_string(source)

        template = Template('{% if x %}{{ a }}{% endif %}')

        vars = template.nodelist.get_nodes_by_type(VariableNode)

        self.assertEqual(len(vars), 1)



    def test_ifequal(self):

        source = '{% ifequal x y %}{{ a }}{% endifequal %}'

        template = get_template_from_string(source)

        template = Template('{% ifequal x y %}{{ a }}{% endifequal %}')

        vars = template.nodelist.get_nodes_by_type(VariableNode)

        self.assertEqual(len(vars), 1)



    def test_ifchanged(self):

        source = '{% ifchanged x %}{{ a }}{% endifchanged %}'

        template = get_template_from_string(source)

        template = Template('{% ifchanged x %}{{ a }}{% endifchanged %}')

        vars = template.nodelist.get_nodes_by_type(VariableNode)

        self.assertEqual(len(vars), 1)
@@ -51,7 +46,7 @@ class ErrorIndexTest(TestCase): 
            'five': 5,

        })

        for source, expected_error_source_index in tests:

            template = get_template_from_string(source)

            template = Template(source)

            try:

                template.render(context)

            except (RuntimeError, TypeError) as e:

tests/test_utils/views.py

+2 −2
Original line number Diff line number Diff line 
from django.http import HttpResponse

from django.shortcuts import get_object_or_404

from django.template import loader, Context

from django.template import Context, Template



from .models import Person
@@ -11,7 +11,7 @@ def get_person(request, pk): 




def no_template_used(request):

    template = loader.get_template_from_string("This is a string-based template")

    template = Template("This is a string-based template")

    return HttpResponse(template.render(Context({})))