Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
ad95826c
Commit
ad95826c
authored
Apr 09, 2009
by
Tarek Ziadé
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed #5731: Distutils bdist_wininst no longer worked on non-Windows platforms
parent
c8c358a4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
3 deletions
+40
-3
Lib/distutils/command/bdist_wininst.py
Lib/distutils/command/bdist_wininst.py
+8
-3
Lib/distutils/tests/test_bdist_wininst.py
Lib/distutils/tests/test_bdist_wininst.py
+29
-0
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/distutils/command/bdist_wininst.py
View file @
ad95826c
...
...
@@ -342,10 +342,15 @@ class bdist_wininst (Command):
directory
=
os
.
path
.
dirname
(
__file__
)
# we must use a wininst-x.y.exe built with the same C compiler
# used for python. XXX What about mingw, borland, and so on?
if
self
.
plat_name
==
'win32'
:
sfix
=
''
# if plat_name starts with "win" but is not "win32"
# we want to strip "win" and leave the rest (e.g. -amd64)
# for all other cases, we don't want any suffix
if
self
.
plat_name
!=
'win32'
and
self
.
plat_name
[:
3
]
==
'win'
:
sfix
=
self
.
plat_name
[
3
:]
else
:
sfix
=
self
.
plat_name
[
3
:]
# strip 'win' - leaves eg '-amd64'
sfix
=
''
filename
=
os
.
path
.
join
(
directory
,
"wininst-%.1f%s.exe"
%
(
bv
,
sfix
))
return
open
(
filename
,
"rb"
).
read
()
# class bdist_wininst
Lib/distutils/tests/test_bdist_wininst.py
0 → 100644
View file @
ad95826c
"""Tests for distutils.command.bdist_wininst."""
import
unittest
from
distutils.command.bdist_wininst
import
bdist_wininst
from
distutils.tests
import
support
class
BuildWinInstTestCase
(
support
.
TempdirManager
,
unittest
.
TestCase
):
def
test_get_exe_bytes
(
self
):
# issue5731: command was broken on non-windows platforms
# this test makes sure it works now for every platform
# let's create a command
pkg_pth
,
dist
=
self
.
create_dist
()
cmd
=
bdist_wininst
(
dist
)
cmd
.
ensure_finalized
()
# let's run the code that finds the right wininst*.exe file
# and make sure it finds it and returns its content
# no matter what platform we have
exe_file
=
cmd
.
get_exe_bytes
()
self
.
assert_
(
len
(
exe_file
)
>
10
)
def
test_suite
():
return
unittest
.
makeSuite
(
BuildWinInstTestCase
)
if
__name__
==
'__main__'
:
test_support
.
run_unittest
(
test_suite
())
Misc/NEWS
View file @
ad95826c
...
...
@@ -216,6 +216,9 @@ Core and Builtins
Library
-------
- Issue #5731: Distutils bdist_wininst no longer worked on non-Windows
platforms. Initial patch by Paul Moore.
- Issue #2254: Fix CGIHTTPServer information disclosure. Relative paths are
now collapsed within the url properly before looking in cgi_directories.
...
...
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