3.6.7final

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 267ab6341ada61bac204b39928a225c0102b3b94..ee403a82cc03a39a08add6f930f881cedd65af2a 100644 (file)
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -19,11 +19,11 @@
 #define PY_MAJOR_VERSION       3
 #define PY_MINOR_VERSION       6
 #define PY_MICRO_VERSION       7
-#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.6.7rc2"
+#define PY_VERSION             "3.6.7"
 /*--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 e124436b70758b2a798e1905b9d73ca345454c37..9dc4a71620898891707eca0cb8d0e01e3a3d6dc0 100644 (file)
--- 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:42:51 2018
+# Autogenerated by Sphinx on Sat Oct 20 01:13:41 2018
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
            '\n'
@@ -5320,8 +5320,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.6.7.rst b/Misc/NEWS.d/3.6.7.rst
new file mode 100644 (file)
index 0000000..311f00d
--- /dev/null
+++ b/Misc/NEWS.d/3.6.7.rst
@@ -0,0 +1,8 @@
+.. bpo: 0
+.. date: 2018-10-20
+.. no changes: True
+.. nonce: 66tWQH
+.. release date: 2018-10-20
+.. section: Library
+
+There were no new changes in version 3.6.7.

diff --git a/Misc/NEWS.d/3.6.7rc2.rst b/Misc/NEWS.d/3.6.7rc2.rst
index 33822fdb98a8c75bd92d641e37951b8f1193470a..1557adc9a5c5c45a1f3436df99fd1b617c9fbb78 100644 (file)
--- a/Misc/NEWS.d/3.6.7rc2.rst
+++ b/Misc/NEWS.d/3.6.7rc2.rst
@@ -69,6 +69,18 @@ system clock is adjusted.
 
 ..
 
+.. bpo: 34521
+.. date: 2018-10-13-19-15-23
+.. nonce: YPaiTK
+.. release date: 2018-10-20
+.. 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: 34282
 .. date: 2018-09-02-13-33-35
 .. nonce: ztyXH8

diff --git a/Misc/NEWS.d/next/Library/2018-10-13-19-15-23.bpo-34521.YPaiTK.rst b/Misc/NEWS.d/next/Library/2018-10-13-19-15-23.bpo-34521.YPaiTK.rst
deleted file mode 100644 (file)
index 4f4a7f7..0000000
--- a/Misc/NEWS.d/next/Library/2018-10-13-19-15-23.bpo-34521.YPaiTK.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-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.

diff --git a/README.rst b/README.rst
index 4bd363ff0cbecbbbc2255e8839e7545e9cf5da7f..698d9db3a9a47ba56d89cab221202f773822698d 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,5 @@
-This is Python version 3.6.7 candidate 2
-========================================
+This is Python version 3.6.7
+============================
 
 .. image:: https://travis-ci.org/python/cpython.svg?branch=3.6
    :alt: CPython build status on Travis CI