diff options
| author |   Ned Deily <nad@python.org> | 2018-10-20 01:24:09 -0400 |
|---|---|---|
| committer | Ned Deily <nad@python.org> | 2018-10-20 01:24:09 -0400 |
| commit | 6ec5cf24b7f38ea72bb42d5cd60dca0d3ee332f9 (patch) | |
| tree | 5a6a57f97cfe611bdc437566c34f4e1e10c6b25f | |
| parent | bpo-34576: Revert doc change until it can be properly fixed (GH-9720) (diff) | |
| download | cpython-3.6.7.tar.gz cpython-3.6.7.tar.bz2 cpython-3.6.7.zip | |
3.6.7finalv3.6.7
| -rw-r--r-- | Include/patchlevel.h | 6 | ||||
| -rw-r--r-- | Lib/pydoc_data/topics.py | 5 | ||||
| -rw-r--r-- | Misc/NEWS.d/3.6.7.rst | 8 | ||||
| -rw-r--r-- | Misc/NEWS.d/3.6.7rc2.rst | 12 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-10-13-19-15-23.bpo-34521.YPaiTK.rst | 3 | ||||
| -rw-r--r-- | README.rst | 4 |
6 files changed, 27 insertions, 11 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 267ab6341ad..ee403a82cc0 100644 --- 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 e124436b707..9dc4a716208 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: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 index 00000000000..311f00dd293 --- /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 33822fdb98a..1557adc9a5c 100644 --- 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 index 4f4a7f74864..00000000000 --- 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 4bd363ff0cb..698d9db3a9a 100644 --- 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 |