summaryrefslogtreecommitdiff
path: root/tests/generic_inline_admin/tests.py
diff options
context:
space:
mode:
authorSimon Charette <charette.s@gmail.com>2014-01-22 01:43:33 -0500
committerSimon Charette <charette.s@gmail.com>2014-01-26 14:42:30 -0500
commit10e3faf191d8f230dde8534d1c8fad8c8717816e (patch)
tree26d597787a0a22f0f11b1d1e0daf0c3b1feb5805 /tests/generic_inline_admin/tests.py
parentc3881944e8651ad98e29561154186e87928ca319 (diff)
Fixed #19774 -- Deprecated the contenttypes.generic module.
It contained models, forms and admin objects causing undesirable import side effects. Refs #16368. Thanks to Ramiro, Carl and Loïc for the review.
Diffstat (limited to 'tests/generic_inline_admin/tests.py')
-rw-r--r--tests/generic_inline_admin/tests.py4
1 files changed, 2 insertions, 2 deletions
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