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/admin.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/generic_inline_admin/admin.py') diff --git a/tests/generic_inline_admin/admin.py b/tests/generic_inline_admin/admin.py index c701e4a9eb..d0ce4c70ef 100644 --- a/tests/generic_inline_admin/admin.py +++ b/tests/generic_inline_admin/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from django.contrib.contenttypes import generic +from django.contrib.contenttypes.admin import GenericTabularInline from .models import (Media, PhoneNumber, Episode, EpisodeExtra, Contact, Category, EpisodePermanent, EpisodeMaxNum) @@ -8,7 +8,7 @@ from .models import (Media, PhoneNumber, Episode, EpisodeExtra, Contact, site = admin.AdminSite(name="admin") -class MediaInline(generic.GenericTabularInline): +class MediaInline(GenericTabularInline): model = Media @@ -18,22 +18,22 @@ class EpisodeAdmin(admin.ModelAdmin): ] -class MediaExtraInline(generic.GenericTabularInline): +class MediaExtraInline(GenericTabularInline): model = Media extra = 0 -class MediaMaxNumInline(generic.GenericTabularInline): +class MediaMaxNumInline(GenericTabularInline): model = Media extra = 5 max_num = 2 -class PhoneNumberInline(generic.GenericTabularInline): +class PhoneNumberInline(GenericTabularInline): model = PhoneNumber -class MediaPermanentInline(generic.GenericTabularInline): +class MediaPermanentInline(GenericTabularInline): model = Media can_delete = False -- cgit v1.3