Author: russellm
Date: 2010-11-07 22:42:13 -0600 (Sun, 07 Nov 2010)
New Revision: 14496
Modified:
django/branches/releases/1.2.X/tests/regressiontests/templates/context.py
django/branches/releases/1.2.X/tests/regressiontests/templates/custom.py
django/branches/releases/1.2.X/tests/regressiontests/templates/parser.py
django/branches/releases/1.2.X/tests/regressiontests/templates/unicode.py
Log:
[1.2.X] Corrected some backporting errors in the template tests.
Modified:
django/branches/releases/1.2.X/tests/regressiontests/templates/context.py
===================================================================
--- django/branches/releases/1.2.X/tests/regressiontests/templates/context.py
2010-11-07 23:10:35 UTC (rev 14495)
+++ django/branches/releases/1.2.X/tests/regressiontests/templates/context.py
2010-11-08 04:42:13 UTC (rev 14496)
@@ -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):
Modified:
django/branches/releases/1.2.X/tests/regressiontests/templates/custom.py
===================================================================
--- django/branches/releases/1.2.X/tests/regressiontests/templates/custom.py
2010-11-07 23:10:35 UTC (rev 14495)
+++ django/branches/releases/1.2.X/tests/regressiontests/templates/custom.py
2010-11-08 04:42:13 UTC (rev 14496)
@@ -1,5 +1,6 @@
+from unittest import TestCase
+
from django import template
-from django.utils.unittest import TestCase
class CustomTests(TestCase):
Modified:
django/branches/releases/1.2.X/tests/regressiontests/templates/parser.py
===================================================================
--- django/branches/releases/1.2.X/tests/regressiontests/templates/parser.py
2010-11-07 23:10:35 UTC (rev 14495)
+++ django/branches/releases/1.2.X/tests/regressiontests/templates/parser.py
2010-11-08 04:42:13 UTC (rev 14496)
@@ -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):
Modified:
django/branches/releases/1.2.X/tests/regressiontests/templates/unicode.py
===================================================================
--- django/branches/releases/1.2.X/tests/regressiontests/templates/unicode.py
2010-11-07 23:10:35 UTC (rev 14495)
+++ django/branches/releases/1.2.X/tests/regressiontests/templates/unicode.py
2010-11-08 04:42:13 UTC (rev 14496)
@@ -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 @@
# 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))
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
