Commit ad198fac by Timothée Peignier

fix post_process to work with recent changes in staticfiles

parent 6662bfd6
...@@ -38,7 +38,11 @@ class PipelineStorage(StaticFilesStorage): ...@@ -38,7 +38,11 @@ class PipelineStorage(StaticFilesStorage):
super_class = super(PipelineStorage, self) super_class = super(PipelineStorage, self)
if hasattr(super_class, 'post_process'): if hasattr(super_class, 'post_process'):
return super_class.post_process(paths, dry_run, **options) return super_class.post_process(paths, dry_run, **options)
return paths
return [
(path, path, True)
for path in paths
]
class PipelineCachedStorage(PipelineStorage, CachedStaticFilesStorage): class PipelineCachedStorage(PipelineStorage, CachedStaticFilesStorage):
......
...@@ -29,11 +29,11 @@ class StorageTest(TestCase): ...@@ -29,11 +29,11 @@ class StorageTest(TestCase):
'css/first.css': (self.storage, 'css/first.css'), 'css/first.css': (self.storage, 'css/first.css'),
'images/arrow.png': (self.storage, 'images/arrow.png') 'images/arrow.png': (self.storage, 'images/arrow.png')
})) }))
self.assertEqual(processed_files.keys(), [ self.assertEqual(processed_files, [
'css/first.css', ('css/first.css', 'css/first.css', True),
'images/arrow.png', ('images/arrow.png', 'images/arrow.png', True),
'testing.css', ('testing.css', 'testing.css', True),
'scripts.css' ('scripts.css', 'scripts.css', True)
]) ])
def tearDown(self): def tearDown(self):
......
...@@ -17,7 +17,7 @@ basepython = python2.5 ...@@ -17,7 +17,7 @@ basepython = python2.5
deps = deps =
Django==1.2.4 Django==1.2.4
mock mock
django-staticfiles https://github.com/jezdez/django-staticfiles/zipball/master
unittest2 unittest2
[testenv:py26-1.2.X] [testenv:py26-1.2.X]
...@@ -25,7 +25,7 @@ basepython = python2.6 ...@@ -25,7 +25,7 @@ basepython = python2.6
deps = deps =
Django==1.2.4 Django==1.2.4
mock mock
django-staticfiles https://github.com/jezdez/django-staticfiles/zipball/master
unittest2 unittest2
[testenv:py27-1.2.X] [testenv:py27-1.2.X]
...@@ -33,7 +33,7 @@ basepython = python2.7 ...@@ -33,7 +33,7 @@ basepython = python2.7
deps = deps =
Django==1.2.4 Django==1.2.4
mock mock
django-staticfiles https://github.com/jezdez/django-staticfiles/zipball/master
unittest2 unittest2
[testenv:py25-1.3.X] [testenv:py25-1.3.X]
...@@ -41,7 +41,7 @@ basepython = python2.5 ...@@ -41,7 +41,7 @@ basepython = python2.5
deps = deps =
Django==1.3.1 Django==1.3.1
mock mock
django-staticfiles https://github.com/jezdez/django-staticfiles/zipball/master
unittest2 unittest2
[testenv:py26-1.3.X] [testenv:py26-1.3.X]
...@@ -49,7 +49,7 @@ basepython = python2.6 ...@@ -49,7 +49,7 @@ basepython = python2.6
deps = deps =
Django==1.3.1 Django==1.3.1
mock mock
django-staticfiles https://github.com/jezdez/django-staticfiles/zipball/master
unittest2 unittest2
[testenv:py27-1.3.X] [testenv:py27-1.3.X]
...@@ -57,7 +57,7 @@ basepython = python2.7 ...@@ -57,7 +57,7 @@ basepython = python2.7
deps = deps =
Django==1.3.1 Django==1.3.1
mock mock
django-staticfiles https://github.com/jezdez/django-staticfiles/zipball/master
unittest2 unittest2
[testenv:py25] [testenv:py25]
...@@ -73,7 +73,7 @@ basepython = python2.6 ...@@ -73,7 +73,7 @@ basepython = python2.6
deps = deps =
https://github.com/django/django/zipball/master https://github.com/django/django/zipball/master
mock mock
django-staticfiles https://github.com/jezdez/django-staticfiles/zipball/master
unittest2 unittest2
[testenv:py27] [testenv:py27]
...@@ -81,7 +81,7 @@ basepython = python2.7 ...@@ -81,7 +81,7 @@ basepython = python2.7
deps = deps =
https://github.com/django/django/zipball/master https://github.com/django/django/zipball/master
mock mock
django-staticfiles https://github.com/jezdez/django-staticfiles/zipball/master
unittest2 unittest2
[testenv:pypy] [testenv:pypy]
...@@ -89,7 +89,7 @@ basepython = pypy ...@@ -89,7 +89,7 @@ basepython = pypy
deps = deps =
https://github.com/django/django/zipball/master https://github.com/django/django/zipball/master
mock mock
django-staticfiles https://github.com/jezdez/django-staticfiles/zipball/master
unittest2 unittest2
[testenv:docs] [testenv:docs]
......
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