Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #19291 -- Completed deprecation of ADMIN_MEDIA_PREFIX.

  • Loading branch information...
commit 9b755a298a55849bf8e831a46639999609aedfff 1 parent 778b8bd
Aymeric Augustin aaugustin authored
3  django/conf/__init__.py
View
@@ -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.")
15 django/contrib/admin/templatetags/adminmedia.py
View
@@ -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")
9 docs/internals/deprecation.txt
View
@@ -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.
10 docs/ref/settings.txt
View
@@ -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
5 docs/releases/1.5.txt
View
@@ -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
==========================
Please sign in to comment.
Something went wrong with that request. Please try again.