[Python-checkins] cpython (3.5): build_ext: correctly parse the link_objects user option (closes #1703178)

benjamin.peterson python-checkins at python.org
Thu Sep 29 02:17:23 EDT 2016


https://hg.python.org/cpython/rev/b2f0a31fa441
changeset:   104154:b2f0a31fa441
branch:      3.5
parent:      104150:aba37f35b93b
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Sep 28 23:13:58 2016 -0700
summary:
  build_ext: correctly parse the link_objects user option (closes #1703178)

Patch by Valerie Lambert.

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
@@ -195,6 +195,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
@@ -83,6 +83,9 @@
 Library
 -------
 
+- Issue #1703178: Fix the ability to pass the --link-objects option to the
+  distutils build_ext command.
+
 - Issue #28253: Fixed calendar functions for extreme months: 0001-01
   and 9999-12.
 

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list