From e32095616c50bef9b06dc8637a99584ba947bae5 Mon Sep 17 00:00:00 2001 From: Aymeric Augustin Date: Mon, 23 Dec 2013 16:01:13 +0100 Subject: Imported override_settings from its new location. --- tests/generic_inline_admin/tests.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests/generic_inline_admin') diff --git a/tests/generic_inline_admin/tests.py b/tests/generic_inline_admin/tests.py index 09a802a1bc..e35f0d639a 100644 --- a/tests/generic_inline_admin/tests.py +++ b/tests/generic_inline_admin/tests.py @@ -8,8 +8,7 @@ from django.contrib.contenttypes.generic import ( generic_inlineformset_factory, GenericTabularInline) from django.forms.formsets import DEFAULT_MAX_NUM from django.forms.models import ModelForm -from django.test import TestCase -from django.test.utils import override_settings +from django.test import TestCase, override_settings # local test models from .admin import MediaInline, MediaPermanentInline -- cgit v1.3