Fixed #18035 -- Removed deprecated AdminMediaHandler, as per official... (5c53e306) · Commits · Dom Sekotill / django

django/contrib/admin/static/admin/js/SelectFilter2.js

+4 −4

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@ function findForm(node) {
		}

		window.SelectFilter = {
		init: function(field_id, field_name, is_stacked, admin_media_prefix) {
		init: function(field_id, field_name, is_stacked, admin_static_prefix) {
		if (field_id.match(/__prefix__/)){
		// Don't intialize on empty forms.
		return;
		@@ -43,14 +43,14 @@ window.SelectFilter = {
		var selector_available = quickElement('div', selector_div, '');
		selector_available.className = 'selector-available';
		var title_available = quickElement('h2', selector_available, interpolate(gettext('Available %s') + ' ', [field_name]));
		quickElement('img', title_available, '', 'src', admin_media_prefix + 'img/icon-unknown.gif', 'width', '10', 'height', '10', 'class', 'help help-tooltip', 'title', interpolate(gettext('This is the list of available %s. You may choose some by selecting them in the box below and then clicking the "Choose" arrow between the two boxes.'), [field_name]));
		quickElement('img', title_available, '', 'src', admin_static_prefix + 'img/icon-unknown.gif', 'width', '10', 'height', '10', 'class', 'help help-tooltip', 'title', interpolate(gettext('This is the list of available %s. You may choose some by selecting them in the box below and then clicking the "Choose" arrow between the two boxes.'), [field_name]));

		var filter_p = quickElement('p', selector_available, '', 'id', field_id + '_filter');
		filter_p.className = 'selector-filter';

		var search_filter_label = quickElement('label', filter_p, '', 'for', field_id + "_input");

		var search_selector_img = quickElement('img', search_filter_label, '', 'src', admin_media_prefix + 'img/selector-search.gif', 'class', 'help-tooltip', 'alt', '', 'title', interpolate(gettext("Type into this box to filter down the list of available %s."), [field_name]));
		var search_selector_img = quickElement('img', search_filter_label, '', 'src', admin_static_prefix + 'img/selector-search.gif', 'class', 'help-tooltip', 'alt', '', 'title', interpolate(gettext("Type into this box to filter down the list of available %s."), [field_name]));

		filter_p.appendChild(document.createTextNode(' '));

		@@ -73,7 +73,7 @@ window.SelectFilter = {
		var selector_chosen = quickElement('div', selector_div, '');
		selector_chosen.className = 'selector-chosen';
		var title_chosen = quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s') + ' ', [field_name]));
		quickElement('img', title_chosen, '', 'src', admin_media_prefix + 'img/icon-unknown.gif', 'width', '10', 'height', '10', 'class', 'help help-tooltip', 'title', interpolate(gettext('This is the list of chosen %s. You may remove some by selecting them in the box below and then clicking the "Remove" arrow between the two boxes.'), [field_name]));
		quickElement('img', title_chosen, '', 'src', admin_static_prefix + 'img/icon-unknown.gif', 'width', '10', 'height', '10', 'class', 'help help-tooltip', 'title', interpolate(gettext('This is the list of chosen %s. You may remove some by selecting them in the box below and then clicking the "Remove" arrow between the two boxes.'), [field_name]));

		var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.getAttribute('name'));
		to_box.className = 'filtered';

django/contrib/gis/admin/widgets.py

+1 −2

Original line number	Diff line number	Diff line
		@@ -8,8 +8,7 @@ from django.contrib.gis.geos import GEOSGeometry, GEOSException

		# Creating a template context that contains Django settings
		# values needed by admin map templates.
		geo_context = Context({'ADMIN_MEDIA_PREFIX' : static('admin/'),
		'LANGUAGE_BIDI' : translation.get_language_bidi()})
		geo_context = Context({'LANGUAGE_BIDI' : translation.get_language_bidi()})

		class OpenLayersWidget(Textarea):
		"""

django/contrib/staticfiles/management/commands/runserver.py

+3 −3

Original line number	Diff line number	Diff line
		from optparse import make_option

		from django.conf import settings
		from django.core.management.commands.runserver import BaseRunserverCommand
		from django.core.management.commands.runserver import Command as RunserverCommand

		from django.contrib.staticfiles.handlers import StaticFilesHandler

		class Command(BaseRunserverCommand):
		option_list = BaseRunserverCommand.option_list + (
		class Command(RunserverCommand):
		option_list = RunserverCommand.option_list + (
		make_option('--nostatic', action="store_false", dest='use_static_handler', default=True,
		help='Tells Django to NOT automatically serve static files at STATIC_URL.'),
		make_option('--insecure', action="store_true", dest='insecure_serving', default=False,

django/core/management/commands/runserver.py

+4 −13

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ import sys
		import socket

		from django.core.management.base import BaseCommand, CommandError
		from django.core.servers.basehttp import AdminMediaHandler, run, WSGIServerException, get_internal_wsgi_application
		from django.core.servers.basehttp import run, WSGIServerException, get_internal_wsgi_application
		from django.utils import autoreload

		naiveip_re = re.compile(r"""^(?:
		@@ -17,7 +17,7 @@ naiveip_re = re.compile(r"""^(?:
		DEFAULT_PORT = "8000"


		class BaseRunserverCommand(BaseCommand):
		class Command(BaseCommand):
		option_list = BaseCommand.option_list + (
		make_option('--ipv6', '-6', action='store_true', dest='use_ipv6', default=False,
		help='Tells Django to use a IPv6 address.'),
		@@ -128,15 +128,6 @@ class BaseRunserverCommand(BaseCommand):
		self.stdout.write("%s\n" % shutdown_message)
		sys.exit(0)

		class Command(BaseRunserverCommand):
		option_list = BaseRunserverCommand.option_list + (
		make_option('--adminmedia', dest='admin_media_path', default='',
		help='Specifies the directory from which to serve admin media.'),
		)

		def get_handler(self, args, *options):
		"""
		Serves admin media like old-school (deprecation pending).
		"""
		handler = super(Command, self).get_handler(args, *options)
		return AdminMediaHandler(handler, options.get('admin_media_path'))
		# Kept for backward compatibility
		BaseRunserverCommand = Command

django/core/servers/basehttp.py

+2 −48

Original line number	Diff line number	Diff line
		@@ -22,10 +22,6 @@ from django.core.exceptions import ImproperlyConfigured
		from django.core.management.color import color_style
		from django.core.wsgi import get_wsgi_application
		from django.utils.importlib import import_module
		from django.utils._os import safe_join
		from django.views import static

		from django.contrib.staticfiles import handlers

		__all__ = ['WSGIServer', 'WSGIRequestHandler']

		@@ -131,7 +127,7 @@ class WSGIRequestHandler(simple_server.WSGIRequestHandler, object):

		def __init__(self, args, *kwargs):
		from django.conf import settings
		self.admin_media_prefix = urlparse.urljoin(settings.STATIC_URL, 'admin/')
		self.admin_static_prefix = urlparse.urljoin(settings.STATIC_URL, 'admin/')
		# We set self.path to avoid crashes in log_message() on unsupported
		# requests (like "OPTIONS").
		self.path = ''
		@@ -173,7 +169,7 @@ class WSGIRequestHandler(simple_server.WSGIRequestHandler, object):

		def log_message(self, format, *args):
		# Don't bother logging requests for admin images or the favicon.
		if (self.path.startswith(self.admin_media_prefix)
		if (self.path.startswith(self.admin_static_prefix)
		or self.path == '/favicon.ico'):
		return

		@@ -200,48 +196,6 @@ class WSGIRequestHandler(simple_server.WSGIRequestHandler, object):
		sys.stderr.write(msg)


		class AdminMediaHandler(handlers.StaticFilesHandler):
		"""
		WSGI middleware that intercepts calls to the admin media directory, as
		defined by the STATIC_URL setting, and serves those images.
		Use this ONLY LOCALLY, for development! This hasn't been tested for
		security and is not super efficient.

		This is pending for deprecation since 1.3.
		"""
		def get_base_dir(self):
		return os.path.join(django.__path__[0], 'contrib', 'admin', 'static', 'admin')

		def get_base_url(self):
		from django.conf import settings
		return urlparse.urljoin(settings.STATIC_URL, 'admin/')

		def file_path(self, url):
		"""
		Returns the path to the media file on disk for the given URL.

		The passed URL is assumed to begin with ``self.base_url``. If the
		resulting file path is outside the media directory, then a ValueError
		is raised.
		"""
		relative_url = url[len(self.base_url[2]):]
		relative_path = urllib.url2pathname(relative_url)
		return safe_join(self.base_dir, relative_path)

		def serve(self, request):
		document_root, path = os.path.split(self.file_path(request.path))
		return static.serve(request, path, document_root=document_root)

		def _should_handle(self, path):
		"""
		Checks if the path should be handled. Ignores the path if:

		* the host is provided as part of the base_url
		* the request's path isn't under the base path
		"""
		return path.startswith(self.base_url[2]) and not self.base_url[1]


		def run(addr, port, wsgi_handler, ipv6=False, threading=False):
		server_address = (addr, port)
		if threading: