[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
This commit is contained in:
Russell Keith-Magee 2010-11-08 04:42:13 +00:00
parent 488c9b3f11
commit cbe27e3cc4
4 changed files with 10 additions and 6 deletions

View File

@ -1,6 +1,7 @@
# coding: utf-8
from unittest import TestCase
from django.template import Context
from django.utils.unittest import TestCase
class ContextTests(TestCase):

View File

@ -1,5 +1,6 @@
from unittest import TestCase
from django import template
from django.utils.unittest import TestCase
class CustomTests(TestCase):

View File

@ -1,9 +1,10 @@
"""
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):

View File

@ -1,7 +1,8 @@
# -*- 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))