summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-01-18 13:11:31 -0500
committerTim Graham <timograham@gmail.com>2015-01-18 13:11:31 -0500
commit3b89d2d540a96ffd33c294b576147ff800b16632 (patch)
treeaa63b4d52aa76734d1465879e5c0bdba48c242e7 /django
parentd029fafea1a1f2f257397fbcd0fa3b531e09854f (diff)
Removed contrib.contenttypes.generic per deprecation timeline; refs #19774.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/contenttypes/generic.py21
1 files changed, 0 insertions, 21 deletions
diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py
deleted file mode 100644
index 19622d33d8..0000000000
--- a/django/contrib/contenttypes/generic.py
+++ /dev/null
@@ -1,21 +0,0 @@
-from __future__ import unicode_literals
-
-import warnings
-
-from django.utils.deprecation import RemovedInDjango19Warning
-
-warnings.warn(
- ('django.contrib.contenttypes.generic is deprecated and will be removed in '
- 'Django 1.9. Its contents have been moved to the fields, forms, and admin '
- 'submodules of django.contrib.contenttypes.'), RemovedInDjango19Warning, stacklevel=2
-)
-
-from django.contrib.contenttypes.admin import ( # NOQA
- GenericInlineModelAdmin, GenericStackedInline, GenericTabularInline
-)
-from django.contrib.contenttypes.fields import ( # NOQA
- GenericForeignKey, GenericRelation
-)
-from django.contrib.contenttypes.forms import ( # NOQA
- BaseGenericInlineFormSet, generic_inlineformset_factory
-)