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
261d5723
Commit
261d5723
authored
Jan 04, 2015
by
Jason R. Coombs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename _gen_args to get_args (for consistency).
parent
c3beddd0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
setuptools/command/easy_install.py
setuptools/command/easy_install.py
+5
-5
setuptools/command/install_scripts.py
setuptools/command/install_scripts.py
+1
-1
setuptools/tests/test_easy_install.py
setuptools/tests/test_easy_install.py
+1
-1
No files found.
setuptools/command/easy_install.py
View file @
261d5723
...
...
@@ -745,7 +745,7 @@ Please make the appropriate changes for your system and try again.
def
install_wrapper_scripts
(
self
,
dist
):
if
not
self
.
exclude_scripts
:
for
args
in
ScriptWriter
.
_gen
_args
(
dist
):
for
args
in
ScriptWriter
.
get
_args
(
dist
):
self
.
write_script
(
*
args
)
def
install_script
(
self
,
dist
,
script_name
,
script_text
,
dev_path
=
None
):
...
...
@@ -921,7 +921,7 @@ Please make the appropriate changes for your system and try again.
# delete entry-point scripts to avoid duping
self
.
delete_blockers
(
[
os
.
path
.
join
(
script_dir
,
args
[
0
])
for
args
in
ScriptWriter
.
_gen
_args
(
dist
)]
ScriptWriter
.
get
_args
(
dist
)]
)
# Build .egg file from tmpdir
bdist_egg
.
make_zipfile
(
...
...
@@ -1876,10 +1876,10 @@ class ScriptWriter(object):
@
classmethod
def
get_script_args
(
cls
,
dist
,
executable
=
sys_executable
,
wininst
=
False
):
# for backward compatibility
warnings
.
warn
(
"Use
_gen
_args"
,
DeprecationWarning
)
warnings
.
warn
(
"Use
get
_args"
,
DeprecationWarning
)
writer
=
cls
.
get_writer
(
wininst
)
header
=
cls
.
get_script_header
(
""
,
executable
,
wininst
)
return
writer
.
_gen
_args
(
dist
,
header
)
return
writer
.
get
_args
(
dist
,
header
)
@
classmethod
def
get_script_header
(
cls
,
script_text
,
executable
=
sys_executable
,
wininst
=
False
):
...
...
@@ -1889,7 +1889,7 @@ class ScriptWriter(object):
return
cls
.
get_header
(
script_text
,
executable
)
@
classmethod
def
_gen
_args
(
cls
,
dist
,
header
=
None
):
def
get
_args
(
cls
,
dist
,
header
=
None
):
"""
Yield write_script() argument tuples for a distribution's entrypoints
"""
...
...
setuptools/command/install_scripts.py
View file @
261d5723
...
...
@@ -39,7 +39,7 @@ class install_scripts(orig.install_scripts):
executable
=
"python.exe"
writer
=
ScriptWriter
.
get_writer
(
force_windows
=
is_wininst
)
header
=
ScriptWriter
.
get_header
(
""
,
nt_quote_arg
(
executable
))
for
args
in
writer
.
_gen
_args
(
dist
,
header
):
for
args
in
writer
.
get
_args
(
dist
,
header
):
self
.
write_script
(
*
args
)
def
write_script
(
self
,
script_name
,
contents
,
mode
=
"t"
,
*
ignored
):
...
...
setuptools/tests/test_easy_install.py
View file @
261d5723
...
...
@@ -83,7 +83,7 @@ class TestEasyInstallTest:
def
test_get_script_args
(
self
):
dist
=
FakeDist
()
args
=
next
(
ScriptWriter
.
_gen
_args
(
dist
))
args
=
next
(
ScriptWriter
.
get
_args
(
dist
))
name
,
script
=
itertools
.
islice
(
args
,
2
)
assert
script
==
WANTED
...
...
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