Commit cbe27e3c authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.2.X] Corrected some backporting errors in the template tests.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14496 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 488c9b3f
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
# coding: utf-8
from unittest import TestCase

from django.template import Context
from django.utils.unittest import TestCase


class ContextTests(TestCase):
+2 −1
Original line number Diff line number Diff line
from unittest import TestCase

from django import template
from django.utils.unittest import TestCase


class CustomTests(TestCase):
+2 −1
Original line number Diff line number Diff line
"""
Testing some internals of the template processing. These are *not* examples to be copied in user code.
"""
from unittest import TestCase

from django.template import (TokenParser, FilterExpression, Parser, Variable,
    TemplateSyntaxError)
from django.utils.unittest import TestCase


class ParserTests(TestCase):
+4 −3
Original line number Diff line number Diff line
# -*- coding: utf-8 -*-
from unittest import TestCase

from django.template import Template, TemplateEncodingError, Context
from django.utils.safestring import SafeData
from django.utils.unittest import TestCase


class UnicodeTests(TestCase):
@@ -25,5 +26,5 @@ class UnicodeTests(TestCase):
        # they all render the same (and are returned as unicode objects and
        # "safe" objects as well, for auto-escaping purposes).
        self.assertEqual(t1.render(c3), t2.render(c3))
        self.assertIsInstance(t1.render(c3), unicode)
        self.assertIsInstance(t1.render(c3), SafeData)
        self.assertTrue(isinstance(t1.render(c3), unicode))
        self.assertTrue(isinstance(t1.render(c3), SafeData))