Fixed #19774 -- Deprecated the contenttypes.generic module. (10e3faf1) · Commits · Dom Sekotill / django

django/contrib/comments/models.py

+2 −2

Original line number	Diff line number	Diff line
		from django.conf import settings
		from django.contrib.comments.managers import CommentManager
		from django.contrib.contenttypes import generic
		from django.contrib.contenttypes.fields import GenericForeignKey
		from django.contrib.contenttypes.models import ContentType
		from django.contrib.sites.models import Site
		from django.core import urlresolvers
		@@ -23,7 +23,7 @@ class BaseCommentAbstractModel(models.Model):
		verbose_name=_('content type'),
		related_name="content_type_set_for_%(class)s")
		object_pk = models.TextField(_('object ID'))
		content_object = generic.GenericForeignKey(ct_field="content_type", fk_field="object_pk")
		content_object = GenericForeignKey(ct_field="content_type", fk_field="object_pk")

		# Metadata about the comment
		site = models.ForeignKey(Site)

django/contrib/contenttypes/admin.py

0 → 100644

+60 −0

Original line number	Diff line number	Diff line
		from __future__ import unicode_literals

		from functools import partial

		from django.contrib.admin.options import InlineModelAdmin, flatten_fieldsets
		from django.contrib.contenttypes.forms import (
		BaseGenericInlineFormSet, generic_inlineformset_factory
		)
		from django.forms import ALL_FIELDS
		from django.forms.models import modelform_defines_fields


		class GenericInlineModelAdmin(InlineModelAdmin):
		ct_field = "content_type"
		ct_fk_field = "object_id"
		formset = BaseGenericInlineFormSet

		def get_formset(self, request, obj=None, **kwargs):
		if 'fields' in kwargs:
		fields = kwargs.pop('fields')
		else:
		fields = flatten_fieldsets(self.get_fieldsets(request, obj))
		if self.exclude is None:
		exclude = []
		else:
		exclude = list(self.exclude)
		exclude.extend(self.get_readonly_fields(request, obj))
		if self.exclude is None and hasattr(self.form, '_meta') and self.form._meta.exclude:
		# Take the custom ModelForm's Meta.exclude into account only if the
		# GenericInlineModelAdmin doesn't define its own.
		exclude.extend(self.form._meta.exclude)
		exclude = exclude or None
		can_delete = self.can_delete and self.has_delete_permission(request, obj)
		defaults = {
		"ct_field": self.ct_field,
		"fk_field": self.ct_fk_field,
		"form": self.form,
		"formfield_callback": partial(self.formfield_for_dbfield, request=request),
		"formset": self.formset,
		"extra": self.extra,
		"can_delete": can_delete,
		"can_order": False,
		"fields": fields,
		"max_num": self.max_num,
		"exclude": exclude
		}
		defaults.update(kwargs)

		if defaults['fields'] is None and not modelform_defines_fields(defaults['form']):
		defaults['fields'] = ALL_FIELDS

		return generic_inlineformset_factory(self.model, **defaults)


		class GenericStackedInline(GenericInlineModelAdmin):
		template = 'admin/edit_inline/stacked.html'


		class GenericTabularInline(GenericInlineModelAdmin):
		template = 'admin/edit_inline/tabular.html'

django/contrib/contenttypes/checks.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ from django.apps import apps


		def check_generic_foreign_keys(**kwargs):
		from .generic import GenericForeignKey
		from .fields import GenericForeignKey

		errors = []
		fields = (obj

django/contrib/contenttypes/fields.py

0 → 100644

+576 −0

File added.

Preview size limit exceeded, changes collapsed.

django/contrib/contenttypes/forms.py

0 → 100644

+88 −0

Original line number	Diff line number	Diff line
		from __future__ import unicode_literals

		from django.db import models
		from django.forms import ModelForm, modelformset_factory
		from django.forms.models import BaseModelFormSet
		from django.contrib.contenttypes.models import ContentType


		class BaseGenericInlineFormSet(BaseModelFormSet):
		"""
		A formset for generic inline objects to a parent.
		"""

		def __init__(self, data=None, files=None, instance=None, save_as_new=None,
		prefix=None, queryset=None, **kwargs):
		opts = self.model._meta
		self.instance = instance
		self.rel_name = '-'.join((
		opts.app_label, opts.model_name,
		self.ct_field.name, self.ct_fk_field.name,
		))
		if self.instance is None or self.instance.pk is None:
		qs = self.model._default_manager.none()
		else:
		if queryset is None:
		queryset = self.model._default_manager
		qs = queryset.filter(**{
		self.ct_field.name: ContentType.objects.get_for_model(
		self.instance, for_concrete_model=self.for_concrete_model),
		self.ct_fk_field.name: self.instance.pk,
		})
		super(BaseGenericInlineFormSet, self).__init__(
		queryset=qs, data=data, files=files,
		prefix=prefix,
		**kwargs
		)

		@classmethod
		def get_default_prefix(cls):
		opts = cls.model._meta
		return '-'.join(
		(opts.app_label, opts.model_name,
		cls.ct_field.name, cls.ct_fk_field.name)
		)

		def save_new(self, form, commit=True):
		setattr(form.instance, self.ct_field.get_attname(),
		ContentType.objects.get_for_model(self.instance).pk)
		setattr(form.instance, self.ct_fk_field.get_attname(),
		self.instance.pk)
		return form.save(commit=commit)


		def generic_inlineformset_factory(model, form=ModelForm,
		formset=BaseGenericInlineFormSet,
		ct_field="content_type", fk_field="object_id",
		fields=None, exclude=None,
		extra=3, can_order=False, can_delete=True,
		max_num=None,
		formfield_callback=None, validate_max=False,
		for_concrete_model=True):
		"""
		Returns a ``GenericInlineFormSet`` for the given kwargs.

		You must provide ``ct_field`` and ``fk_field`` if they are different from
		the defaults ``content_type`` and ``object_id`` respectively.
		"""
		opts = model._meta
		# if there is no field called `ct_field` let the exception propagate
		ct_field = opts.get_field(ct_field)
		if not isinstance(ct_field, models.ForeignKey) or ct_field.rel.to != ContentType:
		raise Exception("fk_name '%s' is not a ForeignKey to ContentType" % ct_field)
		fk_field = opts.get_field(fk_field) # let the exception propagate
		if exclude is not None:
		exclude = list(exclude)
		exclude.extend([ct_field.name, fk_field.name])
		else:
		exclude = [ct_field.name, fk_field.name]
		FormSet = modelformset_factory(model, form=form,
		formfield_callback=formfield_callback,
		formset=formset,
		extra=extra, can_delete=can_delete, can_order=can_order,
		fields=fields, exclude=exclude, max_num=max_num,
		validate_max=validate_max)
		FormSet.ct_field = ct_field
		FormSet.ct_fk_field = fk_field
		FormSet.for_concrete_model = for_concrete_model
		return FormSet