summaryrefslogtreecommitdiff
path: root/tests/regressiontests/admin_widgets/tests.py
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-10-11 12:55:17 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-10-11 12:55:17 +0000
commit121d2e36785dc0ce8e7d1c48883fc7b719b21afc (patch)
tree7cddebe1474071a6fed69767378fc3433fd39dbb /tests/regressiontests/admin_widgets/tests.py
parent1070c57b83efdfd4fbed09280fcdaafc6d9c1a81 (diff)
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
Diffstat (limited to 'tests/regressiontests/admin_widgets/tests.py')
-rw-r--r--tests/regressiontests/admin_widgets/tests.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/regressiontests/admin_widgets/tests.py b/tests/regressiontests/admin_widgets/tests.py
index c445644335..900cb4a462 100644
--- a/tests/regressiontests/admin_widgets/tests.py
+++ b/tests/regressiontests/admin_widgets/tests.py
@@ -3,9 +3,10 @@
from django import forms
from django.contrib import admin
from django.contrib.admin import widgets
-from unittest import TestCase
-from django.test import TestCase as DjangoTestCase
from django.db.models import DateField
+from django.test import TestCase as DjangoTestCase
+from django.utils.unittest import TestCase
+
import models
class AdminFormfieldForDBFieldTests(TestCase):