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
4b236573
Commit
4b236573
authored
Apr 27, 2012
by
Timothée Peignier
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #100 from oxys-net/master
fix UnicodeDecodeError on concat
parents
6b694b64
c7b5387b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletions
+3
-1
pipeline/compressors/__init__.py
+3
-1
No files found.
pipeline/compressors/__init__.py
View file @
4b236573
...
...
@@ -5,6 +5,8 @@ import subprocess
from
itertools
import
takewhile
from
django.utils.encoding
import
force_unicode
try
:
from
staticfiles
import
finders
except
ImportError
:
...
...
@@ -134,7 +136,7 @@ class Compressor(object):
output_filename
,
variant
)
return
"url(
%
s)"
%
asset_url
content
=
self
.
read_file
(
path
)
content
=
re
.
sub
(
URL_DETECTOR
,
reconstruct
,
content
)
content
=
re
.
sub
(
URL_DETECTOR
,
reconstruct
,
force_unicode
(
content
)
)
stylesheets
.
append
(
content
)
return
'
\n
'
.
join
(
stylesheets
)
...
...
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