Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixing a few cosmetic bugs. Thanks for the hint, Alex Gaynor.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14307 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 58af951c30670ea19bd2e7795daffd8f14383f71 1 parent 1c4868f
@jezdez jezdez authored
Showing with 7 additions and 4 deletions.
  1. +7 −4 django/contrib/staticfiles/finders.py
View
11 django/contrib/staticfiles/finders.py
@@ -42,10 +42,11 @@ class FileSystemFinder(BaseFinder):
A static files finder that uses the ``STATICFILES_DIRS`` setting
to locate files.
"""
- storages = SortedDict()
- locations = set()
-
def __init__(self, apps=None, *args, **kwargs):
+ # Maps dir paths to an appropriate storage instance
+ self.storages = SortedDict()
+ # Set of locations with static files
+ self.locations = set()
for root in settings.STATICFILES_DIRS:
if isinstance(root, (list, tuple)):
prefix, root = root
@@ -55,6 +56,7 @@ def __init__(self, apps=None, *args, **kwargs):
# Don't initialize multiple storages for the same location
for prefix, root in self.locations:
self.storages[root] = FileSystemStorage(location=root)
+
super(FileSystemFinder, self).__init__(*args, **kwargs)
def find(self, path, all=False):
@@ -99,10 +101,11 @@ class AppDirectoriesFinder(BaseFinder):
"""
A static files finder that looks in the ``media`` directory of each app.
"""
- storages = {}
storage_class = AppStaticStorage
def __init__(self, apps=None, *args, **kwargs):
+ # Maps app modules to appropriate storage instances
+ self.storages = SortedDict()
if apps is not None:
self.apps = apps
else:
Please sign in to comment.
Something went wrong with that request. Please try again.