[1.5.x] Fixed #19291 -- Completed deprecation of ADMIN_MEDIA_PREFIX.

Backport of 9b755a2 from master.

5 files changed, 10 insertions, 32 deletions

diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index dec4cf9418..b00c8d5046 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -110,9 +110,6 @@ class BaseSettings(object):
     def __setattr__(self, name, value):
         if name in ("MEDIA_URL", "STATIC_URL") and value and not value.endswith('/'):
             raise ImproperlyConfigured("If set, %s must end with a slash" % name)
-        elif name == "ADMIN_MEDIA_PREFIX":
-            warnings.warn("The ADMIN_MEDIA_PREFIX setting has been removed; "
-                          "use STATIC_URL instead.", DeprecationWarning)
         elif name == "ALLOWED_INCLUDE_ROOTS" and isinstance(value, six.string_types):
             raise ValueError("The ALLOWED_INCLUDE_ROOTS setting must be set "
                 "to a tuple, not a string.")
diff --git a/django/contrib/admin/templatetags/adminmedia.py b/django/contrib/admin/templatetags/adminmedia.py
deleted file mode 100644
index b08d13c18f..0000000000
--- a/django/contrib/admin/templatetags/adminmedia.py
+++ /dev/null
@@ -1,15 +0,0 @@
-import warnings
-from django.template import Library
-from django.templatetags.static import PrefixNode
-
-register = Library()
-
-@register.simple_tag
-def admin_media_prefix():
-    """
-    Returns the string contained in the setting ADMIN_MEDIA_PREFIX.
-    """
-    warnings.warn(
-        "The admin_media_prefix template tag is deprecated. "
-        "Use the static template tag instead.", DeprecationWarning)
-    return PrefixNode.handle_simple("ADMIN_MEDIA_PREFIX")
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 9fd92db2b4..414da30ff8 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -140,6 +140,11 @@ these changes.
   removed.  In its place use
   :class:`~django.contrib.staticfiles.handlers.StaticFilesHandler`.
 
+* The template tags library ``adminmedia`` and the template tag ``{%
+  admin_media_prefix %}`` will be removed in favor of the generic static files
+  handling. (This is faster than the usual deprecation path; see the
+  :doc:`Django 1.4 release notes</releases/1.4>`.)
+
 * The :ttag:`url` and :ttag:`ssi` template tags will be
   modified so that the first argument to each tag is a template variable, not
   an implied string. In 1.4, this behavior is provided by a version of the tag
@@ -232,10 +237,6 @@ these changes.
   :setting:`LOGGING` setting should include this filter explicitly if
   it is desired.
 
-* The template tag
-  :func:`django.contrib.admin.templatetags.adminmedia.admin_media_prefix`
-  will be removed in favor of the generic static files handling.
-
 * The builtin truncation functions :func:`django.utils.text.truncate_words`
   and :func:`django.utils.text.truncate_html_words` will be removed in
   favor of the ``django.utils.text.Truncator`` class.
diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 5544c99dd1..9b222bf586 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -2210,16 +2210,6 @@ The default value for the X-Frame-Options header used by
 Deprecated settings
 ===================
 
-.. setting:: ADMIN_MEDIA_PREFIX
-
-ADMIN_MEDIA_PREFIX
-------------------
-
-.. deprecated:: 1.4
-   This setting has been obsoleted by the ``django.contrib.staticfiles`` app
-   integration. See the :doc:`Django 1.4 release notes</releases/1.4>` for
-   more information.
-
 .. setting:: AUTH_PROFILE_MODULE
 
 AUTH_PROFILE_MODULE
diff --git a/docs/releases/1.5.txt b/docs/releases/1.5.txt
index c53518feaa..cffc0f23af 100644
--- a/docs/releases/1.5.txt
+++ b/docs/releases/1.5.txt
@@ -574,6 +574,11 @@ Miscellaneous
   HTML validation against pre-HTML5 Strict DTDs, you should add a div around it
   in your pages.
 
+* The template tags library ``adminmedia``, which only contained the
+  deprecated template tag ``{% admin_media_prefix %}``, was removed.
+  Attempting to load it with ``{% load adminmedia %}`` will fail. If your
+  templates still contain that line you must remove it.
+
 Features deprecated in 1.5
 ==========================