summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Samarchyan <desecho@gmail.com>2017-01-26 18:45:07 -0500
committerTim Graham <timograham@gmail.com>2017-01-26 18:45:07 -0500
commit8ae90c58ac6f87aec711701b726fda7b261544cf (patch)
treef667ded15f3fce588672e9245aa1a779fc5486fa
parentc37ec5a6595f963a04fae1b17858225c2b3d08c4 (diff)
Slightly simplified django.conf.urls.static.static().
-rw-r--r--django/conf/urls/static.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/django/conf/urls/static.py b/django/conf/urls/static.py
index e8f8a9e804..8b5995953b 100644
--- a/django/conf/urls/static.py
+++ b/django/conf/urls/static.py
@@ -18,10 +18,10 @@ def static(prefix, view=serve, **kwargs):
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
"""
# No-op if not in debug mode or an non-local prefix
- if not settings.DEBUG or (prefix and '://' in prefix):
- return []
- elif not prefix:
+ if not prefix:
raise ImproperlyConfigured("Empty static prefix not permitted")
+ elif not settings.DEBUG or '://' in prefix:
+ return []
return [
url(r'^%s(?P<path>.*)$' % re.escape(prefix.lstrip('/')), view, kwargs=kwargs),
]