Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37

tests/regressiontests/utils/dateformat.py

@@ -1,12 +1,12 @@
 from datetime import datetime, date
 import os
 import time
-import unittest
 
 from django.utils.dateformat import format
-from django.utils import dateformat, translation
+from django.utils import dateformat, translation, unittest
 from django.utils.tzinfo import FixedOffset, LocalTimezone
 
+
 class DateFormatTests(unittest.TestCase):
     def setUp(self):
         self.old_TZ = os.environ.get('TZ')

tests/regressiontests/utils/feedgenerator.py

@@ -1,7 +1,6 @@
 import datetime
-import unittest
 
-from django.utils import feedgenerator, tzinfo
+from django.utils import feedgenerator, tzinfo, unittest
 
 class FeedgeneratorTest(unittest.TestCase):
     """

tests/regressiontests/utils/functional.py

@@ -1,5 +1,4 @@
-import unittest
-
+from django.utils import unittest
 from django.utils.functional import lazy
 
 

tests/regressiontests/utils/module_loading.py

@@ -1,11 +1,12 @@
 import os
 import sys
-import unittest
 from zipimport import zipimporter
 
+from django.utils import unittest
 from django.utils.importlib import import_module
 from django.utils.module_loading import module_has_submodule
 
+
 class DefaultLoader(unittest.TestCase):
     def test_loader(self):
         "Normal module existence can be tested"

tests/regressiontests/utils/termcolors.py

@@ -1,5 +1,4 @@
-import unittest
-
+from django.utils import unittest
 from django.utils.termcolors import parse_color_setting, PALETTES, DEFAULT_PALETTE, LIGHT_PALETTE, DARK_PALETTE, NOCOLOR_PALETTE
 
 class TermColorTests(unittest.TestCase):