Commit 6728f159 authored by Loic Bistuer's avatar Loic Bistuer Committed by Tim Graham
Browse files

[1.6.x] Fixed #21750 -- Fixed regression introduced by 4befb301. 

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 1e9e7351 from master
parent bd3af2ee

django/contrib/staticfiles/finders.py

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ class FileSystemFinder(BaseFinder): 
                prefix, root = root

            else:

                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")

django/contrib/staticfiles/storage.py

+11 −3
Original line number Diff line number Diff line
@@ -32,13 +32,21 @@ class StaticFilesStorage(FileSystemStorage): 
            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):