diff options
| author | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-12-23 16:01:13 +0100 |
|---|---|---|
| committer | Aymeric Augustin <aymeric.augustin@m4x.org> | 2013-12-23 21:37:56 +0100 |
| commit | e32095616c50bef9b06dc8637a99584ba947bae5 (patch) | |
| tree | cf37f3c2201a0ad6053e9f4acf8a7e6c3507e410 /tests/admin_docs | |
| parent | da16bb30ff238aa4d59b4186d92ef5429d8d0045 (diff) | |
Imported override_settings from its new location.
Diffstat (limited to 'tests/admin_docs')
| -rw-r--r-- | tests/admin_docs/tests.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/admin_docs/tests.py b/tests/admin_docs/tests.py index 9f5ace0360..d2f8386bdb 100644 --- a/tests/admin_docs/tests.py +++ b/tests/admin_docs/tests.py @@ -5,8 +5,7 @@ from django.contrib.sites.models import Site from django.contrib.admindocs import utils from django.contrib.auth.models import User from django.core.urlresolvers import reverse -from django.test import TestCase -from django.test.utils import modify_settings, override_settings +from django.test import TestCase, modify_settings, override_settings class MiscTests(TestCase): |