Skip to content

Commit

Permalink
Removed contrib.contenttypes.generic per deprecation timeline; refs #…
Browse files Browse the repository at this point in the history
…19774.
  • Loading branch information
timgraham committed Jan 18, 2015
1 parent d029faf commit 3b89d2d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 46 deletions.
21 changes: 0 additions & 21 deletions django/contrib/contenttypes/generic.py

This file was deleted.

25 changes: 0 additions & 25 deletions docs/ref/contrib/contenttypes.txt
Expand Up @@ -299,11 +299,6 @@ model:
is ``True``. This mirrors the ``for_concrete_model`` argument to
:meth:`~django.contrib.contenttypes.models.ContentTypeManager.get_for_model`.

.. versionchanged:: 1.7

This class used to be defined in ``django.contrib.contenttypes.generic``.


.. admonition:: Primary key type compatibility

The "object_id" field doesn't have to be the same type as the
Expand Down Expand Up @@ -369,10 +364,6 @@ Reverse generic relations

.. class:: GenericRelation

.. versionchanged:: 1.7

This class used to be defined in ``django.contrib.contenttypes.generic``.

.. attribute:: related_query_name

.. versionadded:: 1.7
Expand Down Expand Up @@ -496,10 +487,6 @@ The :mod:`django.contrib.contenttypes.forms` module provides:

.. class:: BaseGenericInlineFormSet

.. versionchanged:: 1.7

This class used to be defined in ``django.contrib.contenttypes.generic``.

.. function:: 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, min_num=None, validate_min=False)

Returns a ``GenericInlineFormSet`` using
Expand All @@ -515,10 +502,6 @@ The :mod:`django.contrib.contenttypes.forms` module provides:
:class:`~django.contrib.contenttypes.fields.GenericForeignKey.for_concrete_model`
argument on ``GenericForeignKey``.

.. versionchanged:: 1.7

This function used to be defined in ``django.contrib.contenttypes.generic``.

.. versionchanged:: 1.7

``min_num`` and ``validate_min`` were added.
Expand Down Expand Up @@ -557,16 +540,8 @@ information.
The name of the integer field that represents the ID of the related
object. Defaults to ``object_id``.

.. versionchanged:: 1.7

This class used to be defined in ``django.contrib.contenttypes.generic``.

.. class:: GenericTabularInline
.. class:: GenericStackedInline

Subclasses of :class:`GenericInlineModelAdmin` with stacked and tabular
layouts, respectively.

.. versionchanged:: 1.7

These classes used to be defined in ``django.contrib.contenttypes.generic``.

0 comments on commit 3b89d2d

Please sign in to comment.