[Python-checkins] cpython (merge 3.6 -> default): merge 3.6 (#1703178)

Thu Sep 29 02:17:23 EDT 2016

https://hg.python.org/cpython/rev/9485165435e4
changeset: 104156:9485165435e4
parent: 104152:ae0c983d3c65
parent: 104155:eac20127d51e
user: Benjamin Peterson <benjamin at python.org>
date: Wed Sep 28 23:17:12 2016 -0700
summary:
 merge 3.6 (#1703178)
files:
 Lib/distutils/command/build_ext.py | 1 +
 Lib/distutils/tests/test_build_ext.py | 7 +++++++
 Misc/NEWS | 3 +++
 3 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py
--- a/Lib/distutils/command/build_ext.py
+++ b/Lib/distutils/command/build_ext.py
@@ -166,6 +166,7 @@
 self.include_dirs.append(plat_py_include)
 
 self.ensure_string_list('libraries')
+ self.ensure_string_list('link_objects')
 
 # Life is easier if we're not forever checking for None, so
 # simplify these options to empty lists if unset
diff --git a/Lib/distutils/tests/test_build_ext.py b/Lib/distutils/tests/test_build_ext.py
--- a/Lib/distutils/tests/test_build_ext.py
+++ b/Lib/distutils/tests/test_build_ext.py
@@ -194,6 +194,13 @@
 cmd.finalize_options()
 self.assertEqual(cmd.rpath, ['one', 'two'])
 
+ # make sure cmd.link_objects is turned into a list
+ # if it's a string
+ cmd = build_ext(dist)
+ cmd.link_objects = 'one two,three'
+ cmd.finalize_options()
+ self.assertEqual(cmd.link_objects, ['one', 'two', 'three'])
+
 # XXX more tests to perform for win32
 
 # make sure define is turned into 2-tuples
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -371,6 +371,9 @@
 pickling and text representation purposes. Patch by Emanuel Barry and
 Serhiy Storchaka.
 
+- Issue #1703178: Fix the ability to pass the --link-objects option to the
+ distutils build_ext command.
+
 - Issue #28019: itertools.count() no longer rounds non-integer step in range
 between 1.0 and 2.0 to 1.
 
-- 
Repository URL: https://hg.python.org/cpython
