changeset:   103759:a90daae58323
branch:      3.6
parent:      103755:912c3a336b6b
parent:      103758:36550e4f9b4c
user:        Martin Panter <vadmium+py@gmail.com>
date:        Tue Sep 13 12:40:51 2016 +0000
files:       Doc/library/stdtypes.rst Makefile.pre.in Misc/NEWS
description:
Issue #15819: Merge include search from 3.5 into 3.6


diff -r 912c3a336b6b -r a90daae58323 Doc/library/stdtypes.rst
--- a/Doc/library/stdtypes.rst	Tue Sep 13 13:27:26 2016 +0200
+++ b/Doc/library/stdtypes.rst	Tue Sep 13 12:40:51 2016 +0000
@@ -3875,17 +3875,17 @@
       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 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 -r 912c3a336b6b -r a90daae58323 Makefile.pre.in
--- a/Makefile.pre.in	Tue Sep 13 13:27:26 2016 +0200
+++ b/Makefile.pre.in	Tue Sep 13 12:40:51 2016 +0000
@@ -94,7 +94,7 @@
 # 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@
diff -r 912c3a336b6b -r a90daae58323 Misc/NEWS
--- a/Misc/NEWS	Tue Sep 13 13:27:26 2016 +0200
+++ b/Misc/NEWS	Tue Sep 13 12:40:51 2016 +0000
@@ -13,6 +13,12 @@
 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
 =================================