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
Boxiang Sun
slapos.buildout
Commits
b8e50f66
Commit
b8e50f66
authored
Mar 23, 2009
by
Adam Groszer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
made close_fds=not is_win32, but doctests still break?
parent
a9987691
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
src/zc/buildout/testing.py
src/zc/buildout/testing.py
+4
-3
No files found.
src/zc/buildout/testing.py
View file @
b8e50f66
...
@@ -36,6 +36,7 @@ import zc.buildout.easy_install
...
@@ -36,6 +36,7 @@ import zc.buildout.easy_install
from
zc.buildout.rmtree
import
rmtree
from
zc.buildout.rmtree
import
rmtree
fsync
=
getattr
(
os
,
'fsync'
,
lambda
fileno
:
None
)
fsync
=
getattr
(
os
,
'fsync'
,
lambda
fileno
:
None
)
is_win32
=
sys
.
platform
==
'win32'
setuptools_location
=
pkg_resources
.
working_set
.
find
(
setuptools_location
=
pkg_resources
.
working_set
.
find
(
pkg_resources
.
Requirement
.
parse
(
'setuptools'
)).
location
pkg_resources
.
Requirement
.
parse
(
'setuptools'
)).
location
...
@@ -43,7 +44,7 @@ setuptools_location = pkg_resources.working_set.find(
...
@@ -43,7 +44,7 @@ setuptools_location = pkg_resources.working_set.find(
def
cat
(
dir
,
*
names
):
def
cat
(
dir
,
*
names
):
path
=
os
.
path
.
join
(
dir
,
*
names
)
path
=
os
.
path
.
join
(
dir
,
*
names
)
if
(
not
os
.
path
.
exists
(
path
)
if
(
not
os
.
path
.
exists
(
path
)
and
sys
.
platform
==
'win32'
and
is_win32
and
os
.
path
.
exists
(
path
+
'-script.py'
)
and
os
.
path
.
exists
(
path
+
'-script.py'
)
):
):
path
=
path
+
'-script.py'
path
=
path
+
'-script.py'
...
@@ -91,7 +92,7 @@ def system(command, input=''):
...
@@ -91,7 +92,7 @@ def system(command, input=''):
stdin
=
subprocess
.
PIPE
,
stdin
=
subprocess
.
PIPE
,
stdout
=
subprocess
.
PIPE
,
stdout
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
,
stderr
=
subprocess
.
PIPE
,
close_fds
=
True
)
close_fds
=
not
is_win32
)
i
,
o
,
e
=
(
p
.
stdin
,
p
.
stdout
,
p
.
stderr
)
i
,
o
,
e
=
(
p
.
stdin
,
p
.
stdout
,
p
.
stderr
)
if
input
:
if
input
:
i
.
write
(
input
)
i
.
write
(
input
)
...
@@ -133,7 +134,7 @@ def find_python(version):
...
@@ -133,7 +134,7 @@ def find_python(version):
e
=
os
.
environ
.
get
(
'PYTHON%s'
%
version
)
e
=
os
.
environ
.
get
(
'PYTHON%s'
%
version
)
if
e
is
not
None
:
if
e
is
not
None
:
return
e
return
e
if
sys
.
platform
==
'win32'
:
if
is_win32
:
e
=
'
\
Py
t
hon%s%s
\
py
t
hon.exe'
%
tuple
(
version
.
split
(
'.'
))
e
=
'
\
Py
t
hon%s%s
\
py
t
hon.exe'
%
tuple
(
version
.
split
(
'.'
))
if
os
.
path
.
exists
(
e
):
if
os
.
path
.
exists
(
e
):
return
e
return
e
...
...
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