Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Yusei Tahara
slapos.buildout
Commits
6593d1b0
Commit
6593d1b0
authored
Feb 13, 2013
by
Reinout van Rees
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #65
The second line is now inspected for a source encoding
parent
01f9deb4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
0 deletions
+8
-0
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+8
-0
No files found.
src/zc/buildout/easy_install.py
View file @
6593d1b0
...
@@ -46,6 +46,7 @@ default_index_url = os.environ.get(
...
@@ -46,6 +46,7 @@ default_index_url = os.environ.get(
logger
=
logging
.
getLogger
(
'zc.buildout.easy_install'
)
logger
=
logging
.
getLogger
(
'zc.buildout.easy_install'
)
url_match
=
re
.
compile
(
'[a-z0-9+.-]+://'
).
match
url_match
=
re
.
compile
(
'[a-z0-9+.-]+://'
).
match
is_source_encoding_line
=
re
.
compile
(
'coding[:=]
\
s*([-
\
w.]+)'
).
search
is_win32
=
sys
.
platform
==
'win32'
is_win32
=
sys
.
platform
==
'win32'
is_jython
=
sys
.
platform
.
startswith
(
'java'
)
is_jython
=
sys
.
platform
.
startswith
(
'java'
)
...
@@ -1046,12 +1047,18 @@ def _distutils_script(path, dest, script_content, initialization, rsetup):
...
@@ -1046,12 +1047,18 @@ def _distutils_script(path, dest, script_content, initialization, rsetup):
if
not
(
'#!'
in
lines
[
0
])
and
(
'python'
in
lines
[
0
]):
if
not
(
'#!'
in
lines
[
0
])
and
(
'python'
in
lines
[
0
]):
# The script doesn't follow distutil's rules. Ignore it.
# The script doesn't follow distutil's rules. Ignore it.
return
[]
return
[]
source_encoding_line
=
''
original_content
=
''
.
join
(
lines
[
1
:])
original_content
=
''
.
join
(
lines
[
1
:])
if
is_source_encoding_line
(
lines
[
1
]):
# The second line contains a source encoding line. Copy it verbatim.
source_encoding_line
=
lines
[
1
].
rstrip
()
original_content
=
''
.
join
(
lines
[
2
:])
python
=
_safe_arg
(
sys
.
executable
)
python
=
_safe_arg
(
sys
.
executable
)
contents
=
distutils_script_template
%
dict
(
contents
=
distutils_script_template
%
dict
(
python
=
python
,
python
=
python
,
source_encoding_line
=
source_encoding_line
,
path
=
path
,
path
=
path
,
initialization
=
initialization
,
initialization
=
initialization
,
relative_paths_setup
=
rsetup
,
relative_paths_setup
=
rsetup
,
...
@@ -1118,6 +1125,7 @@ if __name__ == '__main__':
...
@@ -1118,6 +1125,7 @@ if __name__ == '__main__':
distutils_script_template
=
script_header
+
'''
\
distutils_script_template
=
script_header
+
'''
\
%(source_encoding_line)s
%(relative_paths_setup)s
%(relative_paths_setup)s
import sys
import sys
sys.path[0:0] = [
sys.path[0:0] = [
...
...
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