diff --git a/django/contrib/admin/__init__.py b/django/contrib/admin/__init__.py index 23f51fabdd..f67995c63a 100644 --- a/django/contrib/admin/__init__.py +++ b/django/contrib/admin/__init__.py @@ -1,12 +1,9 @@ -# ACTION_CHECKBOX_NAME is unused, but should stay since its import from here -# has been referenced in documentation. from django.contrib.admin.decorators import register from django.contrib.admin.filters import ( AllValuesFieldListFilter, BooleanFieldListFilter, ChoicesFieldListFilter, DateFieldListFilter, FieldListFilter, ListFilter, RelatedFieldListFilter, RelatedOnlyFieldListFilter, SimpleListFilter, ) -from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME from django.contrib.admin.options import ( HORIZONTAL, VERTICAL, ModelAdmin, StackedInline, TabularInline, ) @@ -14,10 +11,10 @@ from django.contrib.admin.sites import AdminSite, site from django.utils.module_loading import autodiscover_modules __all__ = [ - "register", "ACTION_CHECKBOX_NAME", "ModelAdmin", "HORIZONTAL", "VERTICAL", - "StackedInline", "TabularInline", "AdminSite", "site", "ListFilter", - "SimpleListFilter", "FieldListFilter", "BooleanFieldListFilter", - "RelatedFieldListFilter", "ChoicesFieldListFilter", "DateFieldListFilter", + "register", "ModelAdmin", "HORIZONTAL", "VERTICAL", "StackedInline", + "TabularInline", "AdminSite", "site", "ListFilter", "SimpleListFilter", + "FieldListFilter", "BooleanFieldListFilter", "RelatedFieldListFilter", + "ChoicesFieldListFilter", "DateFieldListFilter", "AllValuesFieldListFilter", "RelatedOnlyFieldListFilter", "autodiscover", ] diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt index a35ae79ea9..37a3ea9e85 100644 --- a/docs/releases/3.1.txt +++ b/docs/releases/3.1.txt @@ -268,6 +268,10 @@ Miscellaneous * The compatibility imports of ``Context``, ``ContextPopException``, and ``RequestContext`` in ``django.template.base`` are removed. +* The compatibility import of + ``django.contrib.admin.helpers.ACTION_CHECKBOX_NAME`` in + ``django.contrib.admin`` is removed. + * The :setting:`STATIC_URL` and :setting:`MEDIA_URL` settings set to relative paths are now prefixed by the server-provided value of ``SCRIPT_NAME`` (or ``/`` if not set). This change should not affect settings set to valid URLs