diff --git a/django/conf/urls/static.py b/django/conf/urls/static.py index 8b5995953b..be5da4924b 100644 --- a/django/conf/urls/static.py +++ b/django/conf/urls/static.py @@ -17,10 +17,10 @@ def static(prefix, view=serve, **kwargs): # ... the rest of your URLconf goes here ... ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) """ - # No-op if not in debug mode or an non-local prefix if not prefix: raise ImproperlyConfigured("Empty static prefix not permitted") elif not settings.DEBUG or '://' in prefix: + # No-op if not in debug mode or a non-local prefix. return [] return [ url(r'^%s(?P.*)$' % re.escape(prefix.lstrip('/')), view, kwargs=kwargs), diff --git a/django/contrib/admin/actions.py b/django/contrib/admin/actions.py index 447311a47c..044e6163ad 100644 --- a/django/contrib/admin/actions.py +++ b/django/contrib/admin/actions.py @@ -37,7 +37,7 @@ def delete_selected(modeladmin, request, queryset): queryset, opts, request.user, modeladmin.admin_site, using) # The user has already confirmed the deletion. - # Do the deletion and return a None to display the change list view again. + # Do the deletion and return None to display the change list view again. if request.POST.get('post') and not protected: if perms_needed: raise PermissionDenied