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
1f218765
Commit
1f218765
authored
Apr 17, 2011
by
Timothée Peignier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
simplify concat
parent
22368357
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
compress/utils.py
+3
-5
No files found.
compress/utils.py
View file @
1f218765
...
...
@@ -86,7 +86,7 @@ def compress_url(url, prefix=None):
def
concat
(
filenames
,
separator
=
''
):
"""
Concatenate the files from the list of the ``filenames``, ouput separated with ``separator``.
Concatenate the files from the list of the ``filenames``, ou
t
put separated with ``separator``.
"""
# find relative paths in css:
# url definition, any spacing, single or double quotes, no starting slash
...
...
@@ -106,10 +106,8 @@ def concat(filenames, separator=''):
abspath
=
os
.
path
.
normpath
(
os
.
path
.
join
(
'/'
,
os
.
path
.
dirname
(
filename
)))
abspath
=
django_settings
.
COMPRESS_URL
+
abspath
+
'/'
fixed
=
rel_exp
.
sub
(
'
\\
1'
+
abspath
+
'
\\
2
\\
3'
,
contents
)
r
+=
fixed
else
:
r
+=
contents
contents
=
rel_exp
.
sub
(
'
\\
1'
+
abspath
+
'
\\
2
\\
3'
,
contents
)
r
+=
contents
r
+=
separator
return
r
...
...
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