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

4 files changed, 5 insertions, 8 deletions

diff --git a/tests/regressiontests/forms/fields.py b/tests/regressiontests/forms/fields.py
index cf0c3f659c..b3212eada2 100644
--- a/tests/regressiontests/forms/fields.py
+++ b/tests/regressiontests/forms/fields.py
@@ -30,11 +30,10 @@ import re
 import os
 from decimal import Decimal
 
-from unittest import TestCase
-
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.forms import *
 from django.forms.widgets import RadioFieldRenderer
+from django.utils.unittest import TestCase
 
 
 def fix_os_paths(x):
diff --git a/tests/regressiontests/forms/input_formats.py b/tests/regressiontests/forms/input_formats.py
index 498c6de9fb..e362620ddb 100644
--- a/tests/regressiontests/forms/input_formats.py
+++ b/tests/regressiontests/forms/input_formats.py
@@ -1,9 +1,9 @@
 from datetime import time, date, datetime
-from unittest import TestCase
 
 from django import forms
 from django.conf import settings
 from django.utils.translation import activate, deactivate
+from django.utils.unittest import TestCase
 
 
 class LocalizedTimeTests(TestCase):
diff --git a/tests/regressiontests/forms/validators.py b/tests/regressiontests/forms/validators.py
index ed8e8fbd9a..cadf660ab8 100644
--- a/tests/regressiontests/forms/validators.py
+++ b/tests/regressiontests/forms/validators.py
@@ -1,8 +1,7 @@
-from unittest import TestCase
-
 from django import forms
 from django.core import validators
 from django.core.exceptions import ValidationError
+from django.utils.unittest import TestCase
 
 
 class TestFieldWithValidators(TestCase):
diff --git a/tests/regressiontests/forms/widgets.py b/tests/regressiontests/forms/widgets.py
index 10483a7675..2c21d197b2 100644
--- a/tests/regressiontests/forms/widgets.py
+++ b/tests/regressiontests/forms/widgets.py
@@ -1265,10 +1265,9 @@ u'<input type="hidden" name="date_0" value="17.09.2007" /><input type="hidden" n
 
 """
 
-
-from django.utils import copycompat as copy
-from unittest import TestCase
 from django import forms
+from django.utils import copycompat as copy
+from django.utils.unittest import TestCase
 from django.core.files.uploadedfile import SimpleUploadedFile