diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-09-13 12:40:51 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-09-13 12:40:51 (GMT) |
| commit | b2317a4d9d7c94f5026a07c48118b58500ac1e79 (patch) | |
| tree | 2af71d5d1fbea3ff9dad0af43b30d2371a6505d1 | |
| parent | ed9c0706cf29efafdea39043c78260e404a16c8f (diff) | |
| parent | 134192630a28d6ae6c2a256f95a44a2dd3c65388 (diff) | |
| download | cpython-b2317a4d9d7c94f5026a07c48118b58500ac1e79.zip cpython-b2317a4d9d7c94f5026a07c48118b58500ac1e79.tar.gz cpython-b2317a4d9d7c94f5026a07c48118b58500ac1e79.tar.bz2 | |
Issue #15819: Merge include search from 3.5 into 3.6
| -rw-r--r-- | Doc/library/stdtypes.rst | 12 | ||||
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 6 |
3 files changed, 13 insertions, 7 deletions
diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst index 214422d..ec0ace8 100644 --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -3875,17 +3875,17 @@ The constructors for both classes work the same: Test whether the set is a proper superset of *other*, that is, ``set >= other and set != other``. - .. method:: union(other, ...) + .. method:: union(*others) set | other | ... Return a new set with elements from the set and all others. - .. method:: intersection(other, ...) + .. method:: intersection(*others) set & other & ... Return a new set with elements common to the set and all others. - .. method:: difference(other, ...) + .. method:: difference(*others) set - other - ... Return a new set with elements in the set that are not in the others. @@ -3935,17 +3935,17 @@ The constructors for both classes work the same: The following table lists operations available for :class:`set` that do not apply to immutable instances of :class:`frozenset`: - .. method:: update(other, ...) + .. method:: update(*others) set |= other | ... Update the set, adding elements from all others. - .. method:: intersection_update(other, ...) + .. method:: intersection_update(*others) set &= other & ... Update the set, keeping only elements found in it and all others. - .. method:: difference_update(other, ...) + .. method:: difference_update(*others) set -= other | ... Update the set, removing elements found in others. diff --git a/Makefile.pre.in b/Makefile.pre.in index cffb1a1..3ddeedf 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -94,7 +94,7 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST) # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to # be able to build extension modules using the directories specified in the # environment variables -PY_CPPFLAGS= $(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) +PY_CPPFLAGS= $(BASECPPFLAGS) -I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS) NO_AS_NEEDED= @NO_AS_NEEDED@ LDLAST= @LDLAST@ @@ -13,6 +13,12 @@ Core and Builtins Library ------- +Build +----- + +- Issue #15819: Remove redundant include search directory option for building + outside the source tree. + What's New in Python 3.6.0 beta 1 ================================= |