Commit f4776b78 by Timothée Peignier

one last renaming

parent 0e12c903
...@@ -16,7 +16,7 @@ PIPELINE_VERSION_REMOVE_OLD = getattr(settings, 'PIPELINE_VERSION_REMOVE_OLD', T ...@@ -16,7 +16,7 @@ PIPELINE_VERSION_REMOVE_OLD = getattr(settings, 'PIPELINE_VERSION_REMOVE_OLD', T
PIPELINE_VERSIONING = getattr(settings, 'PIPELINE_VERSIONING', 'pipeline.versioning.mtime.MTimeVersioning') PIPELINE_VERSIONING = getattr(settings, 'PIPELINE_VERSIONING', 'pipeline.versioning.mtime.MTimeVersioning')
PIPELINE_STORAGE = getattr(settings, 'PIPELINE_STORAGE', PIPELINE_STORAGE = getattr(settings, 'PIPELINE_STORAGE',
'pipeline.storage.CompressStorage') 'pipeline.storage.PipelineStorage')
PIPELINE_CSS_COMPRESSOR = getattr(settings, 'PIPELINE_CSS_COMPRESSOR', PIPELINE_CSS_COMPRESSOR = getattr(settings, 'PIPELINE_CSS_COMPRESSOR',
'pipeline.compressors.yui.YUICompressor' 'pipeline.compressors.yui.YUICompressor'
......
from django.contrib.staticfiles.finders import BaseStorageFinder from django.contrib.staticfiles.finders import BaseStorageFinder
from pipeline.storage import CompressStorage from pipeline.storage import PipelineStorage
class CompressFinder(BaseStorageFinder): class PipelineFinder(BaseStorageFinder):
storage = CompressStorage storage = PipelineStorage
...@@ -8,13 +8,13 @@ from django.utils.functional import LazyObject ...@@ -8,13 +8,13 @@ from django.utils.functional import LazyObject
from pipeline.conf import settings from pipeline.conf import settings
class CompressStorage(FileSystemStorage): class PipelineStorage(FileSystemStorage):
def __init__(self, location=None, base_url=None, *args, **kwargs): def __init__(self, location=None, base_url=None, *args, **kwargs):
if location is None: if location is None:
location = settings.PIPELINE_ROOT location = settings.PIPELINE_ROOT
if base_url is None: if base_url is None:
base_url = settings.PIPELINE_URL base_url = settings.PIPELINE_URL
super(CompressStorage, self).__init__(location, base_url, *args, **kwargs) super(PipelineStorage, self).__init__(location, base_url, *args, **kwargs)
def accessed_time(self, name): def accessed_time(self, name):
return datetime.fromtimestamp(os.path.getatime(self.path(name))) return datetime.fromtimestamp(os.path.getatime(self.path(name)))
......
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