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
921fc3e2
Commit
921fc3e2
authored
10 years ago
by
Jason R. Coombs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Renamed .get_writer to .best and removed boolean argument.
parent
21ebac85
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
11 deletions
+27
-11
CHANGES.txt
CHANGES.txt
+2
-0
setuptools/command/easy_install.py
setuptools/command/easy_install.py
+19
-6
setuptools/command/install_scripts.py
setuptools/command/install_scripts.py
+6
-5
No files found.
CHANGES.txt
View file @
921fc3e2
...
...
@@ -10,6 +10,8 @@ CHANGES
``build.executable``, such that an executable of "/usr/bin/env my-python" may
be specified. This means that systems with a specified executable whose name
has spaces in the path must be updated to escape or quote that value.
* Deprecated ``easy_install.ScriptWriter.get_writer``, replaced by ``.best()``
with slightly different semantics (no force_windows flag).
------
11.3.1
...
...
This diff is collapsed.
Click to expand it.
setuptools/command/easy_install.py
View file @
921fc3e2
...
...
@@ -742,7 +742,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
.
get_args
(
dist
):
for
args
in
ScriptWriter
.
best
().
get_args
(
dist
):
self
.
write_script
(
*
args
)
def
install_script
(
self
,
dist
,
script_name
,
script_text
,
dev_path
=
None
):
...
...
@@ -1975,7 +1975,7 @@ class ScriptWriter(object):
def
get_script_args
(
cls
,
dist
,
executable
=
None
,
wininst
=
False
):
# for backward compatibility
warnings
.
warn
(
"Use get_args"
,
DeprecationWarning
)
writer
=
cls
.
get_writer
(
wininst
)
writer
=
(
WindowsScriptWriter
if
wininst
else
ScriptWriter
).
best
(
)
header
=
cls
.
get_script_header
(
""
,
executable
,
wininst
)
return
writer
.
get_args
(
dist
,
header
)
...
...
@@ -2007,9 +2007,16 @@ class ScriptWriter(object):
@
classmethod
def
get_writer
(
cls
,
force_windows
):
if
force_windows
or
sys
.
platform
==
'win32'
:
return
WindowsScriptWriter
.
get_writer
()
return
cls
# for backward compatibility
warnings
.
warn
(
"Use best"
,
DeprecationWarning
)
return
WindowsScriptWriter
.
best
()
if
force_windows
else
cls
.
best
()
@
classmethod
def
best
(
cls
):
"""
Select the best ScriptWriter for this environment.
"""
return
WindowsScriptWriter
.
best
()
if
sys
.
platform
==
'win32'
else
cls
@
classmethod
def
_get_script_args
(
cls
,
type_
,
name
,
header
,
script_text
):
...
...
@@ -2027,8 +2034,14 @@ class ScriptWriter(object):
class
WindowsScriptWriter
(
ScriptWriter
):
@
classmethod
def
get_writer
(
cls
):
# for backward compatibility
warnings
.
warn
(
"Use best"
,
DeprecationWarning
)
return
cls
.
best
()
@
classmethod
def
best
(
cls
):
"""
Get a script w
riter suitable for Windows
Select the best ScriptW
riter suitable for Windows
"""
writer_lookup
=
dict
(
executable
=
WindowsExecutableLauncherWriter
,
...
...
This diff is collapsed.
Click to expand it.
setuptools/command/install_scripts.py
View file @
921fc3e2
...
...
@@ -13,7 +13,7 @@ class install_scripts(orig.install_scripts):
self
.
no_ep
=
False
def
run
(
self
):
from
setuptools.command.easy_install
import
ScriptWriter
,
CommandSpec
import
setuptools.command.easy_install
as
ei
self
.
run_command
(
"egg_info"
)
if
self
.
distribution
.
scripts
:
...
...
@@ -30,14 +30,15 @@ class install_scripts(orig.install_scripts):
ei_cmd
.
egg_name
,
ei_cmd
.
egg_version
,
)
bs_cmd
=
self
.
get_finalized_command
(
'build_scripts'
)
cmd
=
CommandSpec
.
from_param
(
getattr
(
bs_cmd
,
'executable'
,
None
))
cmd
=
ei
.
CommandSpec
.
from_param
(
getattr
(
bs_cmd
,
'executable'
,
None
))
is_wininst
=
getattr
(
self
.
get_finalized_command
(
"bdist_wininst"
),
'_is_running'
,
False
)
writer
=
ei
.
ScriptWriter
if
is_wininst
:
cmd
=
CommandSpec
.
from_string
(
"python.exe"
)
writer
=
ScriptWriter
.
get_writer
(
force_windows
=
is_wininst
)
for
args
in
writer
.
get_args
(
dist
,
cmd
.
as_header
()):
cmd
=
ei
.
CommandSpec
.
from_string
(
"python.exe"
)
writer
=
ei
.
WindowsScriptWriter
for
args
in
writer
.
best
().
get_args
(
dist
,
cmd
.
as_header
()):
self
.
write_script
(
*
args
)
def
write_script
(
self
,
script_name
,
contents
,
mode
=
"t"
,
*
ignored
):
...
...
This diff is collapsed.
Click to expand it.
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