Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
setuptools
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
setuptools
Commits
0d37c617
Commit
0d37c617
authored
Jul 13, 2016
by
Jason R. Coombs
Committed by
GitHub
Jul 13, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #639 from stepshal/block-comment
Format block comments.
parents
0fc24e1a
f1e3a3fc
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
setuptools/site-patch.py
setuptools/site-patch.py
+2
-2
setuptools/tests/environment.py
setuptools/tests/environment.py
+4
-4
setuptools/tests/test_build_py.py
setuptools/tests/test_build_py.py
+1
-1
No files found.
setuptools/site-patch.py
View file @
0d37c617
...
...
@@ -10,7 +10,7 @@ def __boot():
pic
=
getattr
(
sys
,
'path_importer_cache'
,
{})
stdpath
=
sys
.
path
[
len
(
PYTHONPATH
):]
mydir
=
os
.
path
.
dirname
(
__file__
)
#print "searching",stdpath,sys.path
#
print "searching",stdpath,sys.path
for
item
in
stdpath
:
if
item
==
mydir
or
not
item
:
...
...
@@ -39,7 +39,7 @@ def __boot():
else
:
raise
ImportError
(
"Couldn't find the real 'site' module"
)
#print "loaded", __file__
#
print "loaded", __file__
known_paths
=
dict
([(
makepath
(
item
)[
1
],
1
)
for
item
in
sys
.
path
])
# 2.2 comp
...
...
setuptools/tests/environment.py
View file @
0d37c617
...
...
@@ -25,11 +25,11 @@ def run_setup_py(cmd, pypath=None, path=None,
for
envname
in
os
.
environ
:
env
[
envname
]
=
os
.
environ
[
envname
]
#override the python path if needed
#
override the python path if needed
if
pypath
is
not
None
:
env
[
"PYTHONPATH"
]
=
pypath
#overide the execution path if needed
#
overide the execution path if needed
if
path
is
not
None
:
env
[
"PATH"
]
=
path
if
not
env
.
get
(
"PATH"
,
""
):
...
...
@@ -50,11 +50,11 @@ def run_setup_py(cmd, pypath=None, path=None,
except
OSError
:
return
1
,
''
#decode the console string if needed
#
decode the console string if needed
if
hasattr
(
data
,
"decode"
):
# use the default encoding
data
=
data
.
decode
()
data
=
unicodedata
.
normalize
(
'NFC'
,
data
)
#communciate calls wait()
#
communciate calls wait()
return
proc
.
returncode
,
data
setuptools/tests/test_build_py.py
View file @
0d37c617
...
...
@@ -26,6 +26,6 @@ def test_directories_in_package_data_glob(tmpdir_as_cwd):
package_data
=
{
''
:
[
'path/*'
]},
))
os
.
makedirs
(
'path/subpath'
)
#with contexts.quiet():
#
with contexts.quiet():
dist
.
parse_command_line
()
dist
.
run_commands
()
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