openstack/deb-python-django-compressor
Code Issues Proposed changes

Minor style changes.

Browse Source
This commit is contained in:
Jannis Leidel
2011-09-07 12:50:10 +02:00
parent 98859c26d1
commit caf9eeb023
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
compressor/conf.py
View File

@@ -12,14 +12,14 @@ class CompressorConf(AppConf):
# Allows changing verbosity from the settings. # Allows changing verbosity from the settings.
VERBOSE = False VERBOSE = False
# GET variable that disables compressor e.g. "nocompress" # GET variable that disables compressor e.g. "nocompress"
DEBUG_TOGGLE = "None" DEBUG_TOGGLE = 'None'
# the backend to use when parsing the JavaScript or Stylesheet files # the backend to use when parsing the JavaScript or Stylesheet files
PARSER = 'compressor.parser.AutoSelectParser' PARSER = 'compressor.parser.AutoSelectParser'
OUTPUT_DIR = 'CACHE' OUTPUT_DIR = 'CACHE'
STORAGE = 'compressor.storage.CompressorFileStorage' STORAGE = 'compressor.storage.CompressorFileStorage'
CSS_COMPRESSOR = "compressor.css.CssCompressor" CSS_COMPRESSOR = 'compressor.css.CssCompressor'
JS_COMPRESSOR = "compressor.js.JsCompressor" JS_COMPRESSOR = 'compressor.js.JsCompressor'
URL = None URL = None
ROOT = None ROOT = None
@@ -73,46 +73,44 @@ class CompressorConf(AppConf):
if not value: if not value:
value = settings.MEDIA_ROOT value = settings.MEDIA_ROOT
if not value: if not value:
raise ImproperlyConfigured( raise ImproperlyConfigured("COMPRESS_ROOT setting must be set")
"The COMPRESS_ROOT setting must be set.")
return os.path.normcase(os.path.abspath(value)) return os.path.normcase(os.path.abspath(value))
def configure_url(self, value): def configure_url(self, value):
# Uses Django 1.3's STATIC_URL by default or falls back to MEDIA_URL # Uses Django 1.3's STATIC_URL by default or falls back to MEDIA_URL
if value is None: if value is None:
value = getattr(settings, "STATIC_URL", None) value = getattr(settings, 'STATIC_URL', None)
if not value: if not value:
value = settings.MEDIA_URL value = settings.MEDIA_URL
if not value.endswith("/"): if not value.endswith('/'):
raise ImproperlyConfigured("The URL settings (e.g. COMPRESS_URL) " raise ImproperlyConfigured("URL settings (e.g. COMPRESS_URL) "
"must have a trailing slash.") "must have a trailing slash")
return value return value
def configure_cache_backend(self, value): def configure_cache_backend(self, value):
if value is None: if value is None:
# If we are on Django 1.3 AND using the new CACHES setting... # If we are on Django 1.3 AND using the new CACHES setting...
if DJANGO_VERSION[:2] >= (1, 3) and hasattr(settings, "CACHES"): if DJANGO_VERSION[:2] >= (1, 3) and hasattr(settings, 'CACHES'):
value = "default" value = 'default'
else: else:
# falling back to the old CACHE_BACKEND setting # falling back to the old CACHE_BACKEND setting
value = getattr(settings, "CACHE_BACKEND", None) value = getattr(settings, 'CACHE_BACKEND', None)
if not value: if not value:
raise ImproperlyConfigured( raise ImproperlyConfigured("Please specify a cache "
"Please specify a cache backend in your settings.") "backend in your settings.")
return value return value
def configure_offline_context(self, value): def configure_offline_context(self, value):
if not value: if not value:
value = { value = {'MEDIA_URL': settings.MEDIA_URL}
"MEDIA_URL": settings.MEDIA_URL,
}
# Adds the 1.3 STATIC_URL setting to the context if available # Adds the 1.3 STATIC_URL setting to the context if available
if getattr(settings, "STATIC_URL", None): if getattr(settings, 'STATIC_URL', None):
value["STATIC_URL"] = settings.STATIC_URL value['STATIC_URL'] = settings.STATIC_URL
return value return value
def configure_precompilers(self, value): def configure_precompilers(self, value):
if not isinstance(value, (list, tuple)): if not isinstance(value, (list, tuple)):
raise ImproperlyConfigured("The COMPRESS_PRECOMPILERS setting " raise ImproperlyConfigured("The COMPRESS_PRECOMPILERS setting "
"must be a list or tuple. Check for missing commas.") "must be a list or tuple. Check for "
"missing commas.")
return value return value