Merge tag 'v3.7.1' into 3.7

6 files changed, 34 insertions, 16 deletions

diff --git a/Doc/library/http.server.rst b/Doc/library/http.server.rst
index 0b93c62288..0bd7f778ce 100644
--- a/Doc/library/http.server.rst
+++ b/Doc/library/http.server.rst
@@ -16,14 +16,6 @@
 
 This module defines classes for implementing HTTP servers (Web servers).
 
-Security Considerations
------------------------
-
-http.server is meant for demo purposes and does not implement the stringent
-security checks needed of real HTTP server. We do not recommend
-using this module directly in production.
-
-
 One class, :class:`HTTPServer`, is a :class:`socketserver.TCPServer` subclass.
 It creates and listens at the HTTP socket, dispatching the requests to a
 handler.  Code to create and run the server looks like this::
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 9e0bd965cf..667facb9c6 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -19,11 +19,11 @@
 #define PY_MAJOR_VERSION        3
 #define PY_MINOR_VERSION        7
 #define PY_MICRO_VERSION        1
-#define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL       2
+#define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL       0
 
 /* Version as a string */
-#define PY_VERSION              "3.7.1rc2+"
+#define PY_VERSION              "3.7.1"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
diff --git a/Lib/pydoc_data/topics.py b/Lib/pydoc_data/topics.py
index f3ef36b245..f5b9aa137b 100644
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Sat Oct 13 02:40:00 2018
+# Autogenerated by Sphinx on Sat Oct 20 01:59:27 2018
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
            '\n'
@@ -5526,8 +5526,7 @@ topics = {'assert': 'The "assert" statement\n'
                   '   3232235521\n'
                   '   >>>\n'
                   '   >>> width = 5\n'
-                  '   >>> for num in range(5,12): #doctest: '
-                  '+NORMALIZE_WHITESPACE\n'
+                  '   >>> for num in range(5,12): \n'
                   "   ...     for base in 'dXob':\n"
                   "   ...         print('{0:{width}{base}}'.format(num, "
                   "base=base, width=width), end=' ')\n"
diff --git a/Misc/NEWS.d/3.7.1.rst b/Misc/NEWS.d/3.7.1.rst
new file mode 100644
index 0000000000..67eeb85909
--- /dev/null
+++ b/Misc/NEWS.d/3.7.1.rst
@@ -0,0 +1,7 @@
+.. bpo: 34970
+.. date: 2018-10-13-11-14-13
+.. nonce: SrJTY7
+.. release date: 2018-10-20
+.. section: Library
+
+Protect tasks weak set manipulation in ``asyncio.all_tasks()``
diff --git a/Misc/NEWS.d/3.7.1rc2.rst b/Misc/NEWS.d/3.7.1rc2.rst
index 89c5aebc93..3f7e70a1d8 100644
--- a/Misc/NEWS.d/3.7.1rc2.rst
+++ b/Misc/NEWS.d/3.7.1rc2.rst
@@ -49,6 +49,15 @@ Fixed integer overflow in the :meth:`~hashlib.shake.digest()` and
 
 ..
 
+.. bpo: 34909
+.. date: 2018-10-20-00-35-19
+.. nonce: Ew_8DC
+.. section: Library
+
+Enum: fix grandchildren subclassing when parent mixed with concrete data
+types.
+
+..
 .. bpo: 34900
 .. date: 2018-10-05-05-55-53
 .. nonce: 8RNiFu
@@ -89,6 +98,17 @@ system clock is adjusted.
 
 ..
 
+.. bpo: 34521
+.. date: 2018-10-13-19-15-23
+.. nonce: YPaiTK
+.. section: Library
+
+Use :func:`socket.CMSG_SPACE` to calculate ancillary data size instead of
+:func:`socket.CMSG_LEN` in :func:`multiprocessing.reduction.recvfds` as
+:rfc:`3542` requires the use of the former for portable applications.
+
+..
+
 .. bpo: 34334
 .. date: 2018-09-25-08-42-34
 .. nonce: rSPBW9
diff --git a/README.rst b/README.rst
index b6eb0a38bb..9b08049ef0 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-This is Python version 3.7.1 rc2+
-=================================
+This is Python version 3.7.1
+============================
 
 .. image:: https://travis-ci.org/python/cpython.svg?branch=master
    :alt: CPython build status on Travis CI