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
65ff0c01
Commit
65ff0c01
authored
Mar 08, 2012
by
Timothée Peignier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make it works again with python2.5
parent
2c8d7a2b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
55 additions
and
2 deletions
+55
-2
pipeline/compressors/__init__.py
+2
-2
pipeline/utils.py
+53
-0
No files found.
pipeline/compressors/__init__.py
View file @
65ff0c01
...
...
@@ -11,7 +11,7 @@ except ImportError:
from
django.contrib.staticfiles
import
finders
# noqa
from
pipeline.conf
import
settings
from
pipeline.utils
import
to_class
from
pipeline.utils
import
to_class
,
relpath
from
pipeline.storage
import
default_storage
MAX_IMAGE_SIZE
=
32700
...
...
@@ -199,7 +199,7 @@ class Compressor(object):
"""Rewrite paths relative to the output stylesheet path"""
absolute_path
=
os
.
path
.
join
(
settings
.
PIPELINE_ROOT
,
absolute_path
)
output_path
=
os
.
path
.
join
(
settings
.
PIPELINE_ROOT
,
os
.
path
.
dirname
(
output_filename
))
return
os
.
path
.
relpath
(
absolute_path
,
output_path
)
return
relpath
(
absolute_path
,
output_path
)
def
read_file
(
self
,
path
):
"""Read file content in binary mode"""
...
...
pipeline/utils.py
View file @
65ff0c01
import
os
import
sys
import
urllib
from
django.utils
import
importlib
...
...
@@ -18,3 +20,54 @@ def filepath_to_uri(path):
if
path
is
None
:
return
path
return
urllib
.
quote
(
smart_str
(
path
)
.
replace
(
"
\\
"
,
"/"
),
safe
=
"/~!*()'#?"
)
def
_relpath_nt
(
path
,
start
=
os
.
path
.
curdir
):
"""Return a relative version of a path"""
if
not
path
:
raise
ValueError
(
"no path specified"
)
start_list
=
os
.
path
.
abspath
(
start
)
.
split
(
os
.
path
.
sep
)
path_list
=
os
.
path
.
abspath
(
path
)
.
split
(
os
.
path
.
sep
)
if
start_list
[
0
]
.
lower
()
!=
path_list
[
0
]
.
lower
():
unc_path
,
rest
=
os
.
path
.
splitunc
(
path
)
unc_start
,
rest
=
os
.
path
.
splitunc
(
start
)
if
bool
(
unc_path
)
^
bool
(
unc_start
):
raise
ValueError
(
"Cannot mix UNC and non-UNC paths (
%
s and
%
s)"
%
(
path
,
start
))
else
:
raise
ValueError
(
"path is on drive
%
s, start on drive
%
s"
%
(
path_list
[
0
],
start_list
[
0
]))
# Work out how much of the filepath is shared by start and path.
for
i
in
range
(
min
(
len
(
start_list
),
len
(
path_list
))):
if
start_list
[
i
]
.
lower
()
!=
path_list
[
i
]
.
lower
():
break
else
:
i
+=
1
rel_list
=
[
os
.
path
.
pardir
]
*
(
len
(
start_list
)
-
i
)
+
path_list
[
i
:]
if
not
rel_list
:
return
os
.
path
.
curdir
return
os
.
path
.
join
(
*
rel_list
)
def
_relpath_posix
(
path
,
start
=
os
.
path
.
curdir
):
"""Return a relative version of a path"""
if
not
path
:
raise
ValueError
(
"no path specified"
)
start_list
=
os
.
path
.
abspath
(
start
)
.
split
(
os
.
path
.
sep
)
path_list
=
os
.
path
.
abspath
(
path
)
.
split
(
os
.
path
.
sep
)
# Work out how much of the filepath is shared by start and path.
i
=
len
(
os
.
path
.
commonprefix
([
start_list
,
path_list
]))
rel_list
=
[
os
.
path
.
pardir
]
*
(
len
(
start_list
)
-
i
)
+
path_list
[
i
:]
if
not
rel_list
:
return
os
.
path
.
curdir
return
os
.
path
.
join
(
*
rel_list
)
if
os
.
path
is
sys
.
modules
.
get
(
'ntpath'
):
relpath
=
_relpath_nt
else
:
relpath
=
_relpath_posix
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