Merge tag 'v3.7.1rc2' into 3.7

2026-02-12 12:57:15 -08:00 · 2018-10-13 16:43:23 -04:00
parent 5dbb1b7df1 6c06ef7dc3
commit d04d3eaa6b
20 changed files with 187 additions and 87 deletions
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION        7
 #define PY_MICRO_VERSION        1
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL       1
+#define PY_RELEASE_SERIAL       2

 /* Version as a string */
-#define PY_VERSION              "3.7.1rc1+"
+#define PY_VERSION              "3.7.1rc2"
 /*--end constants--*/

 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Wed Sep 26 02:03:50 2018
+# Autogenerated by Sphinx on Sat Oct 13 02:40:00 2018
 topics = {'assert': 'The "assert" statement\n'
           '**********************\n'
           '\n'
@@ -5526,7 +5526,8 @@ topics = {'assert': 'The "assert" statement\n'
                  '   3232235521\n'
                  '   >>>\n'
                  '   >>> width = 5\n'
-                  '   >>> for num in range(5,12): \n'
+                  '   >>> for num in range(5,12): #doctest: '
+                  '+NORMALIZE_WHITESPACE\n'
                  "   ...     for base in 'dXob':\n"
                  "   ...         print('{0:{width}{base}}'.format(num, "
                  "base=base, width=width), end=' ')\n"
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -242,63 +242,29 @@ def library_recipes():
                  "TCL_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tcl8.6'%(getVersion())),
                  },
              ),
+          dict(
+              name="Tk 8.6.8",
+              url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.8-src.tar.gz",
+              checksum='5e0faecba458ee1386078fb228d008ba',
+              patches=[
+                  "tk868_on_10_8_10_9.patch",
+                   ],
+              buildDir="unix",
+              configure_pre=[
+                    '--enable-aqua',
+                    '--enable-shared',
+                    '--enable-threads',
+                    '--libdir=/Library/Frameworks/Python.framework/Versions/%s/lib'%(getVersion(),),
+              ],
+              useLDFlags=False,
+              install='make TCL_LIBRARY=%(TCL_LIBRARY)s TK_LIBRARY=%(TK_LIBRARY)s && make install TCL_LIBRARY=%(TCL_LIBRARY)s TK_LIBRARY=%(TK_LIBRARY)s DESTDIR=%(DESTDIR)s'%{
+                  "DESTDIR": shellQuote(os.path.join(WORKDIR, 'libraries')),
+                  "TCL_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tcl8.6'%(getVersion())),
+                  "TK_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tk8.6'%(getVersion())),
+                  },
+                ),
        ])

-        # temporary workaround in 3.7.1 for addressing bpo-34370:
-        #   use development snapshot of Tk 8.6 branch (post 8.6.8) to pick up
-        #   potential fixes for various scrolling problems seen with 8.6.8.
-        #   However, the snapshot fails to build on 10.6.  For the moment,
-        #   continue to build the 3.7.x 10.6 variant with the standard
-        #   8.6.6 branch.
-        if getDeptargetTuple() < (10, 9):
-            result.extend([
-              dict(
-                  name="Tk 8.6.8",
-                  url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.8-src.tar.gz",
-                  checksum='5e0faecba458ee1386078fb228d008ba',
-                  patches=[
-                      "tk868_on_10_8_10_9.patch",
-                       ],
-                  buildDir="unix",
-                  configure_pre=[
-                        '--enable-aqua',
-                        '--enable-shared',
-                        '--enable-threads',
-                        '--libdir=/Library/Frameworks/Python.framework/Versions/%s/lib'%(getVersion(),),
-                  ],
-                  useLDFlags=False,
-                  install='make TCL_LIBRARY=%(TCL_LIBRARY)s TK_LIBRARY=%(TK_LIBRARY)s && make install TCL_LIBRARY=%(TCL_LIBRARY)s TK_LIBRARY=%(TK_LIBRARY)s DESTDIR=%(DESTDIR)s'%{
-                      "DESTDIR": shellQuote(os.path.join(WORKDIR, 'libraries')),
-                      "TCL_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tcl8.6'%(getVersion())),
-                      "TK_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tk8.6'%(getVersion())),
-                      },
-                    ),
-            ])
-        else:
-            result.extend([
-              dict(
-                  name="Tk 8.6.8+",
-                  url="http://core.tcl.tk/tk/tarball/16fdad9d/tk-16fdad9d.tar.gz",
-                  checksum='b8e0df69021924e8392f03d506252bdb',
-                  patches=[
-                      "tk868_on_10_8_10_9.patch",
-                       ],
-                  buildDir="unix",
-                  configure_pre=[
-                        '--enable-aqua',
-                        '--enable-shared',
-                        '--enable-threads',
-                        '--libdir=/Library/Frameworks/Python.framework/Versions/%s/lib'%(getVersion(),),
-                  ],
-                  useLDFlags=False,
-                  install='make TCL_LIBRARY=%(TCL_LIBRARY)s TK_LIBRARY=%(TK_LIBRARY)s && make install TCL_LIBRARY=%(TCL_LIBRARY)s TK_LIBRARY=%(TK_LIBRARY)s DESTDIR=%(DESTDIR)s'%{
-                      "DESTDIR": shellQuote(os.path.join(WORKDIR, 'libraries')),
-                      "TCL_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tcl8.6'%(getVersion())),
-                      "TK_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tk8.6'%(getVersion())),
-                      },
-                    ),
-            ])
-
    if PYTHON_3:
        result.extend([
          dict(
--- a/Misc/NEWS.d/3.7.1rc2.rst
+++ b/Misc/NEWS.d/3.7.1rc2.rst
@@ -0,0 +1,159 @@
+.. bpo: 34879
+.. date: 2018-10-02-22-55-11
+.. nonce: 7VNH2a
+.. release date: 2018-10-13
+.. section: Core and Builtins
+
+Fix a possible null pointer dereference in bytesobject.c.  Patch by Zackery
+Spytz.
+
+..
+
+.. bpo: 34854
+.. date: 2018-09-30-19-27-13
+.. nonce: 6TKTcB
+.. section: Core and Builtins
+
+Fixed a crash in compiling string annotations containing a lambda with a
+keyword-only argument that doesn't have a default value.
+
+..
+
+.. bpo: 34320
+.. date: 2018-08-02-22-34-59
+.. nonce: hNshAA
+.. section: Core and Builtins
+
+Fix ``dict(od)`` didn't copy iteration order of OrderedDict.
+
+..
+
+.. bpo: 34769
+.. date: 2018-10-09-11-01-16
+.. nonce: cSkkZt
+.. section: Library
+
+Fix for async generators not finalizing when event loop is in debug mode and
+garbage collector runs in another thread.
+
+..
+
+.. bpo: 34922
+.. date: 2018-10-07-21-18-52
+.. nonce: 37IdsA
+.. section: Library
+
+Fixed integer overflow in the :meth:`~hashlib.shake.digest()` and
+:meth:`~hashlib.shake.hexdigest()` methods for the SHAKE algorithm in the
+:mod:`hashlib` module.
+
+..
+
+.. bpo: 34900
+.. date: 2018-10-05-05-55-53
+.. nonce: 8RNiFu
+.. section: Library
+
+Fixed :meth:`unittest.TestCase.debug` when used to call test methods with
+subtests.  Patch by Bruno Oliveira.
+
+..
+
+.. bpo: 34871
+.. date: 2018-10-04-18-46-54
+.. nonce: t3X-dB
+.. section: Library
+
+Fix inspect module polluted ``sys.modules`` when parsing
+``__text_signature__`` of callable.
+
+..
+
+.. bpo: 34872
+.. date: 2018-10-02-19-36-34
+.. nonce: yWZRhI
+.. section: Library
+
+Fix self-cancellation in C implementation of asyncio.Task
+
+..
+
+.. bpo: 34819
+.. date: 2018-09-27-09-45-00
+.. nonce: 9ZaFyO
+.. section: Library
+
+Use a monotonic clock to compute timeouts in :meth:`Executor.map` and
+:func:`as_completed`, in order to prevent timeouts from deviating when the
+system clock is adjusted.
+
+..
+
+.. bpo: 34334
+.. date: 2018-09-25-08-42-34
+.. nonce: rSPBW9
+.. section: Library
+
+In :class:`QueueHandler`, clear `exc_text` from :class:`LogRecord` to
+prevent traceback from being written twice.
+
+..
+
+.. bpo: 6721
+.. date: 2018-09-13-10-09-19
+.. nonce: ZUL_F3
+.. section: Library
+
+Acquire the logging module's commonly used internal locks while fork()ing to
+avoid deadlocks in the child process.
+
+..
+
+.. bpo: 34172
+.. date: 2018-07-26-10-31-52
+.. nonce: 8ovLNi
+.. section: Library
+
+Fix a reference issue inside multiprocessing.Pool that caused the pool to
+remain alive if it was deleted without being closed or terminated
+explicitly.
+
+..
+
+.. bpo: 32174
+.. date: 2018-10-08-19-15-28
+.. nonce: YO9CYm
+.. section: Documentation
+
+chm document displays non-ASCII charaters properly on some MBCS Windows
+systems.
+
+..
+
+.. bpo: 32962
+.. date: 2018-05-10-16-59-15
+.. nonce: S-rcIN
+.. section: Tests
+
+Fixed test_gdb when Python is compiled with flags -mcet -fcf-protection -O0.
+
+..
+
+.. bpo: 34370
+.. date: 2018-10-12-22-43-02
+.. nonce: kTJas4
+.. section: macOS
+
+Revert to using the released Tk 8.6.8 with macOS installers instead of the
+Tk 8.6.x development snapshot used with 3.7.1rc1 and 3.6.7rc1. The snapshot
+introduced at least one significant regression (bpo-34927).
+
+..
+
+.. bpo: 34910
+.. date: 2018-10-05-17-06-49
+.. nonce: tSFrls
+.. section: C API
+
+Ensure that :c:func:`PyObject_Print` always returns ``-1`` on error.  Patch
+by Zackery Spytz.
--- a/API/2018-10-05-17-06-49.bpo-34910.tSFrls.rst
+++ b/API/2018-10-05-17-06-49.bpo-34910.tSFrls.rst
@@ -1,2 +0,0 @@
-Ensure that :c:func:`PyObject_Print` always returns ``-1`` on error.  Patch
-by Zackery Spytz.
--- a/Builtins/2018-08-02-22-34-59.bpo-34320.hNshAA.rst
+++ b/Builtins/2018-08-02-22-34-59.bpo-34320.hNshAA.rst
@@ -1 +0,0 @@
-Fix ``dict(od)`` didn't copy iteration order of OrderedDict.
--- a/Builtins/2018-09-30-19-27-13.bpo-34854.6TKTcB.rst
+++ b/Builtins/2018-09-30-19-27-13.bpo-34854.6TKTcB.rst
@@ -1,2 +0,0 @@
-Fixed a crash in compiling string annotations containing a lambda with a
-keyword-only argument that doesn't have a default value.
--- a/Builtins/2018-10-02-22-55-11.bpo-34879.7VNH2a.rst
+++ b/Builtins/2018-10-02-22-55-11.bpo-34879.7VNH2a.rst
@@ -1,2 +0,0 @@
-Fix a possible null pointer dereference in bytesobject.c.  Patch by Zackery
-Spytz.
--- a/Misc/NEWS.d/next/Documentation/2018-10-08-19-15-28.bpo-32174.YO9CYm.rst
+++ b/Misc/NEWS.d/next/Documentation/2018-10-08-19-15-28.bpo-32174.YO9CYm.rst
@@ -1,2 +0,0 @@
-chm document displays non-ASCII charaters properly on some MBCS Windows
-systems.
--- a/Misc/NEWS.d/next/Library/2018-07-26-10-31-52.bpo-34172.8ovLNi.rst
+++ b/Misc/NEWS.d/next/Library/2018-07-26-10-31-52.bpo-34172.8ovLNi.rst
@@ -1 +0,0 @@
-Fix a reference issue inside multiprocessing.Pool that caused the pool to remain alive if it was deleted without being closed or terminated explicitly.
--- a/Misc/NEWS.d/next/Library/2018-09-13-10-09-19.bpo-6721.ZUL_F3.rst
+++ b/Misc/NEWS.d/next/Library/2018-09-13-10-09-19.bpo-6721.ZUL_F3.rst
@@ -1,2 +0,0 @@
-Acquire the logging module's commonly used internal locks while fork()ing to
-avoid deadlocks in the child process.
--- a/Misc/NEWS.d/next/Library/2018-09-25-08-42-34.bpo-34334.rSPBW9.rst
+++ b/Misc/NEWS.d/next/Library/2018-09-25-08-42-34.bpo-34334.rSPBW9.rst
@@ -1,2 +0,0 @@
-In :class:`QueueHandler`, clear `exc_text` from :class:`LogRecord` to
-prevent traceback from being written twice.
--- a/Misc/NEWS.d/next/Library/2018-09-27-09-45-00.bpo-34819.9ZaFyO.rst
+++ b/Misc/NEWS.d/next/Library/2018-09-27-09-45-00.bpo-34819.9ZaFyO.rst
@@ -1 +0,0 @@
-Use a monotonic clock to compute timeouts in :meth:`Executor.map` and :func:`as_completed`, in order to prevent timeouts from deviating when the system clock is adjusted.
--- a/Misc/NEWS.d/next/Library/2018-10-02-19-36-34.bpo-34872.yWZRhI.rst
+++ b/Misc/NEWS.d/next/Library/2018-10-02-19-36-34.bpo-34872.yWZRhI.rst
@@ -1 +0,0 @@
-Fix self-cancellation in C implementation of asyncio.Task
--- a/Misc/NEWS.d/next/Library/2018-10-04-18-46-54.bpo-34871.t3X-dB.rst
+++ b/Misc/NEWS.d/next/Library/2018-10-04-18-46-54.bpo-34871.t3X-dB.rst
@@ -1,2 +0,0 @@
-Fix inspect module polluted ``sys.modules`` when parsing
-``__text_signature__`` of callable.
--- a/Misc/NEWS.d/next/Library/2018-10-05-05-55-53.bpo-34900.8RNiFu.rst
+++ b/Misc/NEWS.d/next/Library/2018-10-05-05-55-53.bpo-34900.8RNiFu.rst
@@ -1,2 +0,0 @@
-Fixed :meth:`unittest.TestCase.debug` when used to call test methods with
-subtests.  Patch by Bruno Oliveira.
--- a/Misc/NEWS.d/next/Library/2018-10-07-21-18-52.bpo-34922.37IdsA.rst
+++ b/Misc/NEWS.d/next/Library/2018-10-07-21-18-52.bpo-34922.37IdsA.rst
@@ -1,3 +0,0 @@
-Fixed integer overflow in the :meth:`~hashlib.shake.digest()` and
-:meth:`~hashlib.shake.hexdigest()` methods for the SHAKE algorithm
-in the :mod:`hashlib` module.
--- a/Misc/NEWS.d/next/Library/2018-10-09-11-01-16.bpo-34769.cSkkZt.rst
+++ b/Misc/NEWS.d/next/Library/2018-10-09-11-01-16.bpo-34769.cSkkZt.rst
@@ -1,2 +0,0 @@
-Fix for async generators not finalizing when event loop is in debug mode and
-garbage collector runs in another thread.
--- a/Misc/NEWS.d/next/Tests/2018-05-10-16-59-15.bpo-32962.S-rcIN.rst
+++ b/Misc/NEWS.d/next/Tests/2018-05-10-16-59-15.bpo-32962.S-rcIN.rst
@@ -1 +0,0 @@
-Fixed test_gdb when Python is compiled with flags -mcet -fcf-protection -O0.
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-This is Python version 3.7.1rc1+
-================================
+This is Python version 3.7.1 candidate 2
+========================================

 .. image:: https://travis-ci.org/python/cpython.svg?branch=master
   :alt: CPython build status on Travis CI
				`@@ -1 +0,0 @@`
				Fix ``dict(od)`` didn't copy iteration order of OrderedDict.
				`@@ -1 +0,0 @@`
				`Fix a reference issue inside multiprocessing.Pool that caused the pool to remain alive if it was deleted without being closed or terminated explicitly.`
				`@@ -1 +0,0 @@`
				Use a monotonic clock to compute timeouts in :meth:`Executor.map` and :func:`as_completed`, in order to prevent timeouts from deviating when the system clock is adjusted.
				`@@ -1 +0,0 @@`
				`Fix self-cancellation in C implementation of asyncio.Task`
				`@@ -1 +0,0 @@`
				`Fixed test_gdb when Python is compiled with flags -mcet -fcf-protection -O0.`