Skip to content

Commit 3ff878c

Browse files
committed
stop using weird PIPELINE settings
1 parent e1a6bea commit 3ff878c

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

pipeline/compilers/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def compile(self, paths, force=False):
3939
outdated = self.is_outdated(input_path, output_path)
4040
compiler.compile_file(infile, outfile, outdated=outdated, force=force)
4141
except CompilerError:
42-
if not self.storage.exists(output_path) or not settings.PIPELINE:
42+
if not self.storage.exists(output_path) or settings.DEBUG:
4343
raise
4444
return paths
4545

pipeline/conf/settings.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
from django.conf import settings
44

5-
PIPELINE = getattr(settings, 'PIPELINE', not settings.DEBUG)
5+
DEBUG = getattr(settings, 'DEBUG', False)
6+
67
PIPELINE_ROOT = getattr(settings, 'PIPELINE_ROOT', settings.STATIC_ROOT)
78
PIPELINE_URL = getattr(settings, 'PIPELINE_URL', settings.STATIC_URL)
89

pipeline/jinja2/ext.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def html(self, name):
6666
"""Render the HTML Snippet"""
6767
self.get_package(name)
6868
if self.package:
69-
if settings.PIPELINE:
69+
if not settings.DEBUG:
7070
return self.render(self.package.output_filename)
7171
else:
7272
paths = self.packager.compile(self.package.paths)

pipeline/manifest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def collect_packages(self):
3333
def cache(self):
3434
ignore_patterns = getattr(settings, "STATICFILES_IGNORE_PATTERNS", None)
3535

36-
if settings.PIPELINE:
36+
if not settings.DEBUG:
3737
for package in self.packages:
3838
self.package_files.append(package.output_filename)
3939
yield str(self.packager.individual_url(package.output_filename))

pipeline/templatetags/compressed.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def render(self, context):
2828
except PackageNotFound:
2929
return '' # fail silently, do not return anything if an invalid group is specified
3030

31-
if settings.PIPELINE:
31+
if not settings.DEBUG:
3232
return self.render_css(package, package.output_filename)
3333
else:
3434
paths = self.packager.compile(package.paths)
@@ -64,7 +64,7 @@ def render(self, context):
6464
except PackageNotFound:
6565
return '' # fail silently, do not return anything if an invalid group is specified
6666

67-
if settings.PIPELINE:
67+
if not settings.DEBUG:
6868
return self.render_js(package, package.output_filename)
6969
else:
7070
paths = self.packager.compile(package.paths)

0 commit comments

Comments
 (0)