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
Łukasz Nowak
slapos.buildout
Commits
23c77f0c
Commit
23c77f0c
authored
Nov 05, 2013
by
Tres Seaver
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #150 from buildout/issue_130
Open files for 'exec()' w/ universal newlines.
parents
e6aa39a2
ceb7f7ea
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
12 deletions
+13
-12
CHANGES.rst
CHANGES.rst
+3
-0
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+4
-4
src/zc/buildout/easy_install.txt
src/zc/buildout/easy_install.txt
+6
-8
No files found.
CHANGES.rst
View file @
23c77f0c
...
@@ -4,6 +4,9 @@ Change History
...
@@ -4,6 +4,9 @@ Change History
Unreleased
Unreleased
==========
==========
- Open files for ``exec()`` in universal newlines mode. See
https://github.com/buildout/buildout/issues/130
- Add BUILDOUT_HOME as an alternate way to control how the user default
- Add BUILDOUT_HOME as an alternate way to control how the user default
configuration is found.
configuration is found.
...
...
src/zc/buildout/easy_install.py
View file @
23c77f0c
...
@@ -1268,9 +1268,8 @@ if len(sys.argv) > 1:
...
@@ -1268,9 +1268,8 @@ if len(sys.argv) > 1:
sys.argv[:] = _args
sys.argv[:] = _args
__file__ = _args[0]
__file__ = _args[0]
del _options, _args
del _options, _args
__file__f = open(__file__)
with open(__file__, 'U') as __file__f:
exec(compile(__file__f.read(), __file__, "exec"))
exec(compile(__file__f.read(), __file__, "exec"))
__file__f.close(); del __file__f
if _interactive:
if _interactive:
del _interactive
del _interactive
...
@@ -1289,7 +1288,8 @@ __file__ = %(__file__)r
...
@@ -1289,7 +1288,8 @@ __file__ = %(__file__)r
os.chdir(%(setupdir)r)
os.chdir(%(setupdir)r)
sys.argv[0] = %(setup)r
sys.argv[0] = %(setup)r
exec(compile(open(%(setup)r).read(), %(setup)r, 'exec'))
with open(%(setup)r, 'U') as f:
exec(compile(f.read(), %(setup)r, 'exec'))
"""
"""
...
...
src/zc/buildout/easy_install.txt
View file @
23c77f0c
...
@@ -614,7 +614,7 @@ run other scripts with the path set on the working set:
...
@@ -614,7 +614,7 @@ run other scripts with the path set on the working set:
The py script simply runs the Python interactive interpreter with
The py script simply runs the Python interactive interpreter with
the path set:
the path set:
>>> cat(bin, 'py') # doctest: +NORMALIZE_WHITESPACE
>>> cat(bin, 'py') # doctest: +NORMALIZE_WHITESPACE
+REPORT_NDIFF
#!/usr/local/bin/python2.7
#!/usr/local/bin/python2.7
<BLANKLINE>
<BLANKLINE>
import sys
import sys
...
@@ -643,9 +643,8 @@ the path set:
...
@@ -643,9 +643,8 @@ the path set:
sys.argv[:] = _args
sys.argv[:] = _args
__file__ = _args[0]
__file__ = _args[0]
del _options, _args
del _options, _args
__file__f = open(__file__)
with open(__file__, 'U') as __file__f:
exec(compile(__file__f.read(), __file__, "exec"))
exec(compile(__file__f.read(), __file__, "exec"))
__file__f.close(); del __file__f
<BLANKLINE>
<BLANKLINE>
if _interactive:
if _interactive:
del _interactive
del _interactive
...
@@ -872,7 +871,7 @@ Of course, running the script works:
...
@@ -872,7 +871,7 @@ Of course, running the script works:
We specified an interpreter and its paths are adjusted too:
We specified an interpreter and its paths are adjusted too:
>>> cat(bo, 'bin', 'py') # doctest: +NORMALIZE_WHITESPACE
>>> cat(bo, 'bin', 'py') # doctest: +NORMALIZE_WHITESPACE
+REPORT_NDIFF
#!/usr/local/bin/python2.7
#!/usr/local/bin/python2.7
<BLANKLINE>
<BLANKLINE>
import os
import os
...
@@ -909,9 +908,8 @@ We specified an interpreter and its paths are adjusted too:
...
@@ -909,9 +908,8 @@ We specified an interpreter and its paths are adjusted too:
sys.argv[:] = _args
sys.argv[:] = _args
__file__ = _args[0]
__file__ = _args[0]
del _options, _args
del _options, _args
__file__f = open(__file__)
with open(__file__, 'U') as __file__f:
exec(compile(__file__f.read(), __file__, "exec"))
exec(compile(__file__f.read(), __file__, "exec"))
__file__f.close(); del __file__f
<BLANKLINE>
<BLANKLINE>
if _interactive:
if _interactive:
del _interactive
del _interactive
...
...
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