Browse files

Fixed #21750 -- Fixed regression introduced by 4befb30.

Validating STATIC_ROOT in StaticFilesStorage.__init__ turned out to be
problematic - especially with tests - because the storage refuses to work even
if there are no actual interactions with the file system, which is backward

Originally the validation happened in the StaticFilesStorage.path method, but
that didn't work as expected because the call to FileSystemStorage.__init__
replaced the empty value by a valid path. The new approach is to move back the
check to the StaticFilesStorage.path method, but ensure that the location
attribute remains None after the call to super.

Refs #21581.
  • Loading branch information...
1 parent 18374c1 commit 1e9e7351f88a59261da6e616934c8283a6e3e565 @loic loic committed with timgraham Jan 9, 2014
Showing with 12 additions and 4 deletions.
  1. +1 −1 django/contrib/staticfiles/
  2. +11 −3 django/contrib/staticfiles/
@@ -57,7 +57,7 @@ def __init__(self, app_names=None, *args, **kwargs):
prefix, root = root
prefix = ''
- if os.path.abspath(settings.STATIC_ROOT) == os.path.abspath(root):
+ if settings.STATIC_ROOT and os.path.abspath(settings.STATIC_ROOT) == os.path.abspath(root):
raise ImproperlyConfigured(
"The STATICFILES_DIRS setting should "
"not contain the STATIC_ROOT setting")
@@ -32,13 +32,21 @@ def __init__(self, location=None, base_url=None, *args, **kwargs):
location = settings.STATIC_ROOT
if base_url is None:
base_url = settings.STATIC_URL
+ check_settings(base_url)
+ super(StaticFilesStorage, self).__init__(location, base_url,
+ *args, **kwargs)
+ # FileSystemStorage fallbacks to MEDIA_ROOT when location
+ # is empty, so we restore the empty value.
if not location:
+ self.base_location = None
+ self.location = None
+ def path(self, name):
+ if not self.location:
raise ImproperlyConfigured("You're using the staticfiles app "
"without having set the STATIC_ROOT "
"setting to a filesystem path.")
- check_settings(base_url)
- super(StaticFilesStorage, self).__init__(location, base_url,
- *args, **kwargs)
+ return super(StaticFilesStorage, self).path(name)
class CachedFilesMixin(object):

0 comments on commit 1e9e735

Please sign in to comment.