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
b2f5c0a4
Commit
b2f5c0a4
authored
Feb 15, 2012
by
Éric Araujo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix parsing of build_ext --libraries option (#1326113)
parent
4b3c7846
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
Lib/distutils/command/build_ext.py
Lib/distutils/command/build_ext.py
+1
-2
Lib/distutils/tests/test_build_ext.py
Lib/distutils/tests/test_build_ext.py
+6
-6
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/distutils/command/build_ext.py
View file @
b2f5c0a4
...
...
@@ -165,8 +165,7 @@ class build_ext(Command):
if
plat_py_include
!=
py_include
:
self
.
include_dirs
.
append
(
plat_py_include
)
if
isinstance
(
self
.
libraries
,
str
):
self
.
libraries
=
[
self
.
libraries
]
self
.
ensure_string_list
(
'libraries'
)
# Life is easier if we're not forever checking for None, so
# simplify these options to empty lists if unset
...
...
Lib/distutils/tests/test_build_ext.py
View file @
b2f5c0a4
...
...
@@ -178,21 +178,21 @@ class BuildExtTestCase(TempdirManager,
# make sure cmd.libraries is turned into a list
# if it's a string
cmd
=
build_ext
(
dist
)
cmd
.
libraries
=
'my_lib'
cmd
.
libraries
=
'my_lib
, other_lib lastlib
'
cmd
.
finalize_options
()
self
.
assertEqual
(
cmd
.
libraries
,
[
'my_lib'
])
self
.
assertEqual
(
cmd
.
libraries
,
[
'my_lib'
,
'other_lib'
,
'lastlib'
])
# make sure cmd.library_dirs is turned into a list
# if it's a string
cmd
=
build_ext
(
dist
)
cmd
.
library_dirs
=
'my_lib_dir
'
cmd
.
library_dirs
=
'my_lib_dir
%sother_lib_dir'
%
os
.
pathsep
cmd
.
finalize_options
()
self
.
assert
True
(
'my_lib_dir'
in
cmd
.
library_dirs
)
self
.
assert
Equal
(
cmd
.
library_dirs
,
[
'my_lib_dir'
,
'other_lib_dir'
]
)
# make sure rpath is turned into a list
# if it's a
list of os.pathsep's paths
# if it's a
string
cmd
=
build_ext
(
dist
)
cmd
.
rpath
=
os
.
pathsep
.
join
([
'one'
,
'two'
])
cmd
.
rpath
=
'one%stwo'
%
os
.
pathsep
cmd
.
finalize_options
()
self
.
assertEqual
(
cmd
.
rpath
,
[
'one'
,
'two'
])
...
...
Misc/NEWS
View file @
b2f5c0a4
...
...
@@ -119,6 +119,9 @@ Library
- Issue #13015: Fix a possible reference leak in defaultdict.__repr__.
Patch by Suman Saha.
- Issue #1326113: distutils' build_ext command --libraries option now
correctly parses multiple values separated by whitespace or commas.
- Issue #10287: nntplib now queries the server's CAPABILITIES first before
sending MODE READER, and only sends it if not already in READER mode.
Patch by Hynek Schlawack.
...
...
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