Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Preserve order of STATICFILES_DIRS locations in FileSystemFinder.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15389 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 3bff7ed34c0bf29a0fada05cfaf729aaec7cea6d 1 parent 5cd5612
@jezdez jezdez authored
Showing with 4 additions and 5 deletions.
  1. +4 −5 django/contrib/staticfiles/finders.py
View
9 django/contrib/staticfiles/finders.py
@@ -42,10 +42,10 @@ class FileSystemFinder(BaseFinder):
to locate files.
"""
def __init__(self, apps=None, *args, **kwargs):
+ # List of locations with static files
+ self.locations = []
# Maps dir paths to an appropriate storage instance
self.storages = SortedDict()
- # Set of locations with static files
- self.locations = set()
if not isinstance(settings.STATICFILES_DIRS, (list, tuple)):
raise ImproperlyConfigured(
"Your STATICFILES_DIRS setting is not a tuple or list; "
@@ -59,13 +59,12 @@ def __init__(self, apps=None, *args, **kwargs):
raise ImproperlyConfigured(
"The STATICFILES_DIRS setting should "
"not contain the STATIC_ROOT setting")
- self.locations.add((prefix, root))
- # Don't initialize multiple storages for the same location
+ if (prefix, root) not in self.locations:
+ self.locations.append((prefix, root))
for prefix, root in self.locations:
filesystem_storage = FileSystemStorage(location=root)
filesystem_storage.prefix = prefix
self.storages[root] = filesystem_storage
-
super(FileSystemFinder, self).__init__(*args, **kwargs)
def find(self, path, all=False):
Please sign in to comment.
Something went wrong with that request. Please try again.