diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-10-11 12:55:17 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-10-11 12:55:17 +0000 |
| commit | 121d2e36785dc0ce8e7d1c48883fc7b719b21afc (patch) | |
| tree | 7cddebe1474071a6fed69767378fc3433fd39dbb /tests/regressiontests/admin_scripts | |
| parent | 1070c57b83efdfd4fbed09280fcdaafc6d9c1a81 (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_scripts')
| -rw-r--r-- | tests/regressiontests/admin_scripts/tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py index 3dd8ad5d13..52f1bedc44 100644 --- a/tests/regressiontests/admin_scripts/tests.py +++ b/tests/regressiontests/admin_scripts/tests.py @@ -4,13 +4,13 @@ advertised - especially with regards to the handling of the DJANGO_SETTINGS_MODU and default settings.py files. """ import os -import unittest import shutil import sys import re from django import conf, bin, get_version from django.conf import settings +from django.utils import unittest class AdminScriptTestCase(unittest.TestCase): def write_settings(self, filename, apps=None, is_dir=False, sdict=None): |