innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.6.x] 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
incompatible.

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.

Backport of 1e9e7351f8 from master
This commit is contained in:
Loic Bistuer 2014-01-09 22:03:37 +07:00 committed by Tim Graham
parent bd3af2ee64
commit 6728f159f0
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/staticfiles/finders.py
View File

@ -57,7 +57,7 @@ class FileSystemFinder(BaseFinder):
prefix, root = root prefix, root = root
else: else:
prefix = '' 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( raise ImproperlyConfigured(
"The STATICFILES_DIRS setting should " "The STATICFILES_DIRS setting should "
"not contain the STATIC_ROOT setting") "not contain the STATIC_ROOT setting")

16
django/contrib/staticfiles/storage.py
View File

@ -32,13 +32,21 @@ class StaticFilesStorage(FileSystemStorage):
location = settings.STATIC_ROOT location = settings.STATIC_ROOT
if base_url is None: if base_url is None:
base_url = settings.STATIC_URL base_url = settings.STATIC_URL
if not location:
raise ImproperlyConfigured("You're using the staticfiles app "
"without having set the STATIC_ROOT "
"setting to a filesystem path.")
check_settings(base_url) check_settings(base_url)
super(StaticFilesStorage, self).__init__(location, base_url, super(StaticFilesStorage, self).__init__(location, base_url,
*args, **kwargs) *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.")
return super(StaticFilesStorage, self).path(name)
class CachedFilesMixin(object): class CachedFilesMixin(object):