mirror of
https://github.com/python/cpython.git
synced 2025-07-24 03:35:53 +00:00
merge 3.5 (#1703178)
This commit is contained in:
commit
095e32bfc5
3 changed files with 11 additions and 0 deletions
|
@ -166,6 +166,7 @@ class build_ext(Command):
|
||||||
self.include_dirs.append(plat_py_include)
|
self.include_dirs.append(plat_py_include)
|
||||||
|
|
||||||
self.ensure_string_list('libraries')
|
self.ensure_string_list('libraries')
|
||||||
|
self.ensure_string_list('link_objects')
|
||||||
|
|
||||||
# Life is easier if we're not forever checking for None, so
|
# Life is easier if we're not forever checking for None, so
|
||||||
# simplify these options to empty lists if unset
|
# simplify these options to empty lists if unset
|
||||||
|
|
|
@ -194,6 +194,13 @@ class BuildExtTestCase(TempdirManager,
|
||||||
cmd.finalize_options()
|
cmd.finalize_options()
|
||||||
self.assertEqual(cmd.rpath, ['one', 'two'])
|
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
|
# XXX more tests to perform for win32
|
||||||
|
|
||||||
# make sure define is turned into 2-tuples
|
# make sure define is turned into 2-tuples
|
||||||
|
|
|
@ -350,6 +350,9 @@ Library
|
||||||
pickling and text representation purposes. Patch by Emanuel Barry and
|
pickling and text representation purposes. Patch by Emanuel Barry and
|
||||||
Serhiy Storchaka.
|
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
|
- Issue #28019: itertools.count() no longer rounds non-integer step in range
|
||||||
between 1.0 and 2.0 to 1.
|
between 1.0 and 2.0 to 1.
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue