From 10e3faf191d8f230dde8534d1c8fad8c8717816e Mon Sep 17 00:00:00 2001 From: Simon Charette Date: Wed, 22 Jan 2014 01:43:33 -0500 Subject: Fixed #19774 -- Deprecated the contenttypes.generic module. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It contained models, forms and admin objects causing undesirable import side effects. Refs #16368. Thanks to Ramiro, Carl and Loïc for the review. --- tests/generic_inline_admin/tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/generic_inline_admin/tests.py') diff --git a/tests/generic_inline_admin/tests.py b/tests/generic_inline_admin/tests.py index e35f0d639a..b223c98298 100644 --- a/tests/generic_inline_admin/tests.py +++ b/tests/generic_inline_admin/tests.py @@ -4,8 +4,8 @@ import warnings from django.contrib import admin from django.contrib.admin.sites import AdminSite -from django.contrib.contenttypes.generic import ( - generic_inlineformset_factory, GenericTabularInline) +from django.contrib.contenttypes.admin import GenericTabularInline +from django.contrib.contenttypes.forms import generic_inlineformset_factory from django.forms.formsets import DEFAULT_MAX_NUM from django.forms.models import ModelForm from django.test import TestCase, override_settings -- cgit v1.3