Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-pipeline
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
django-pipeline
Commits
4260faf1
Commit
4260faf1
authored
Dec 15, 2012
by
Timothée Peignier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix formatting
parent
c07721a2
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
pipeline/compilers/__init__.py
+1
-1
pipeline/compressors/__init__.py
+2
-1
pipeline/jinja2/ext.py
+1
-2
pipeline/storage.py
+2
-2
pipeline/templatetags/compressed.py
+1
-1
No files found.
pipeline/compilers/__init__.py
View file @
4260faf1
...
...
@@ -4,7 +4,7 @@ import subprocess
try
:
from
staticfiles
import
finders
except
ImportError
:
from
django.contrib.staticfiles
import
finders
# noqa
from
django.contrib.staticfiles
import
finders
# noqa
from
django.core.files.base
import
ContentFile
from
django.utils.encoding
import
smart_str
...
...
pipeline/compressors/__init__.py
View file @
4260faf1
...
...
@@ -11,7 +11,7 @@ from django.utils.encoding import smart_str, force_unicode
try
:
from
staticfiles
import
finders
except
ImportError
:
from
django.contrib.staticfiles
import
finders
# noqa
from
django.contrib.staticfiles
import
finders
# noqa
from
pipeline.conf
import
settings
from
pipeline.storage
import
default_storage
...
...
@@ -232,6 +232,7 @@ class SubProcessCompressor(CompressorBase):
def
execute_command
(
self
,
command
,
content
):
pipe
=
subprocess
.
Popen
(
command
,
shell
=
True
,
stdout
=
subprocess
.
PIPE
,
stdin
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
)
try
:
pipe
.
stdin
.
write
(
smart_str
(
content
))
except
IOError
,
e
:
...
...
pipeline/jinja2/ext.py
View file @
4260faf1
...
...
@@ -46,8 +46,7 @@ class Jinja2Compressed(object):
if
type
(
getattr
(
pipeline_settings
,
setting
))
==
str
:
val
=
"'
%
s'"
%
val
val
=
val
if
val
else
"''"
expr
=
"pipeline_settings.
%
s =
%
s"
%
(
setting
,
val
)
expr
=
"pipeline_settings.
%
s =
%
s"
%
(
setting
,
val
)
exec
expr
pipeline_settings
.
PIPELINE
=
getattr
(
django_settings
,
'PIPELINE'
,
not
django_settings
.
DEBUG
)
...
...
pipeline/storage.py
View file @
4260faf1
...
...
@@ -4,8 +4,8 @@ try:
from
staticfiles
import
finders
from
staticfiles.storage
import
CachedFilesMixin
,
StaticFilesStorage
except
ImportError
:
from
django.contrib.staticfiles
import
finders
# noqa
from
django.contrib.staticfiles.storage
import
CachedFilesMixin
,
StaticFilesStorage
# noqa
from
django.contrib.staticfiles
import
finders
# noqa
from
django.contrib.staticfiles.storage
import
CachedFilesMixin
,
StaticFilesStorage
# noqa
from
django.core.exceptions
import
ImproperlyConfigured
from
django.core.files.storage
import
get_storage_class
...
...
pipeline/templatetags/compressed.py
View file @
4260faf1
try
:
from
staticfiles.storage
import
staticfiles_storage
except
ImportError
:
from
django.contrib.staticfiles.storage
import
staticfiles_storage
# noqa
from
django.contrib.staticfiles.storage
import
staticfiles_storage
# noqa
from
django
import
template
from
django.template.loader
import
render_to_string
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment