Commit 7079de7a by Timothée Peignier

Merge pull request #477 from bertonha/fix-shadow-django-classes

Fix shadons on finders
parents 304b15ae a1dbc3d2
...@@ -30,6 +30,7 @@ or just made Pipeline more awesome. ...@@ -30,6 +30,7 @@ or just made Pipeline more awesome.
* Chris Applegate <chris.applegate@wearesocial.net> * Chris Applegate <chris.applegate@wearesocial.net>
* Chris Reeves <hello@chris.reeves.io> * Chris Reeves <hello@chris.reeves.io>
* Christian Hammond <chipx86@chipx86.com> * Christian Hammond <chipx86@chipx86.com>
* Christofer Bertonha <christoferbertonha@gmail.com>
* Christopher Dilorenzo <dilorenzo.christopher@gmail.com> * Christopher Dilorenzo <dilorenzo.christopher@gmail.com>
* Collin Stedman <cstedman@princeton.edu> * Collin Stedman <cstedman@princeton.edu>
* Corrado Primier <cp@corradoprimier.it> * Corrado Primier <cp@corradoprimier.it>
......
from itertools import chain from itertools import chain
from django.contrib.staticfiles.storage import staticfiles_storage from django.contrib.staticfiles.storage import staticfiles_storage
from django.contrib.staticfiles.finders import BaseFinder, BaseStorageFinder, AppDirectoriesFinder, FileSystemFinder, find from django.contrib.staticfiles.finders import BaseFinder, BaseStorageFinder, find, \
AppDirectoriesFinder as DjangoAppDirectoriesFinder, FileSystemFinder as DjangoFileSystemFinder
from django.utils._os import safe_join from django.utils._os import safe_join
from pipeline.conf import settings from pipeline.conf import settings
...@@ -66,7 +67,7 @@ class PatternFilterMixin(object): ...@@ -66,7 +67,7 @@ class PatternFilterMixin(object):
return super(PatternFilterMixin, self).list(ignore_patterns) return super(PatternFilterMixin, self).list(ignore_patterns)
class AppDirectoriesFinder(PatternFilterMixin, AppDirectoriesFinder): class AppDirectoriesFinder(PatternFilterMixin, DjangoAppDirectoriesFinder):
""" """
Like AppDirectoriesFinder, but doesn't return any additional ignored Like AppDirectoriesFinder, but doesn't return any additional ignored
patterns. patterns.
...@@ -83,7 +84,7 @@ class AppDirectoriesFinder(PatternFilterMixin, AppDirectoriesFinder): ...@@ -83,7 +84,7 @@ class AppDirectoriesFinder(PatternFilterMixin, AppDirectoriesFinder):
] ]
class FileSystemFinder(PatternFilterMixin, FileSystemFinder): class FileSystemFinder(PatternFilterMixin, DjangoFileSystemFinder):
""" """
Like FileSystemFinder, but doesn't return any additional ignored patterns Like FileSystemFinder, but doesn't return any additional ignored patterns
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment