mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-27 11:55:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Issue #15819: Merge include search from 3.5 into 3.6

Browse Source
This commit is contained in:
Martin Panter 2016-09-13 12:40:51 +00:00
commit b2317a4d9d
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Doc/library/stdtypes.rst
View File

@ -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.

2
Makefile.pre.in
View File

@ -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@

6
Misc/NEWS
View File

@ -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
=================================