From f9fbed19a964e55ee703005823d8a7408f83d7f4 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Thu, 27 Jul 2017 13:16:21 +0300 Subject: [3.5] bpo-30876: Add new import test files to projects. (GH-2851). (#2913) (cherry picked from commit d5ed47dea25e04a3a144eddf99a4ac4a29242dbc) --- Makefile.pre.in | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.pre.in b/Makefile.pre.in index 144c1f8..df791a8 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1187,6 +1187,7 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ test/test_import/data \ test/test_import/data/circular_imports \ test/test_import/data/circular_imports/subpkg \ + test/test_import/data/package2 \ test/test_importlib/namespace_pkgs \ test/test_importlib/namespace_pkgs/both_portions \ test/test_importlib/namespace_pkgs/both_portions/foo \ -- cgit v0.12 From 3de144890ad3bc50694368a1b33be6d7f3a780b3 Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Thu, 27 Jul 2017 15:50:04 -0400 Subject: [3.5] bpo-31036: use an existing Misc/NEWS rather than trying to use blurb (#2874) * bpo-31036: use an existing Misc/NEWS rather than trying to use blurb * bpo-31036: avoid echoing comments --- Doc/Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Doc/Makefile b/Doc/Makefile index 5075b02..04da82f 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -40,7 +40,19 @@ help: build: -mkdir -p build - $(BLURB) merge -f build/NEWS +# Look first for a Misc/NEWS file (building from a source release tarball +# or old repo) and use that, otherwise look for a Misc/NEWS.d directory +# (building from a newer repo) and use blurb to generate the NEWS file. + @if [ -f ../Misc/NEWS ] ; then \ + echo "Using existing Misc/NEWS file"; \ + cp ../Misc/NEWS build/NEWS; \ + elif [ -d ../Misc/NEWS.d ]; then \ + echo "Building NEWS from Misc/NEWS.d with blurb"; \ + $(BLURB) merge -f build/NEWS; \ + else \ + echo "Neither Misc/NEWS.d nor Misc/NEWS found; cannot build docs"; \ + exit 1; \ + fi $(SPHINXBUILD) $(ALLSPHINXOPTS) @echo -- cgit v0.12 From 52c41f18086f3d8b1eb3854b568f04717c724e3d Mon Sep 17 00:00:00 2001 From: Mariatta Date: Fri, 28 Jul 2017 19:56:13 -0700 Subject: Fix trivial typo in multiprocessing documentation (GH-2930) (GH-2941) (cherry picked from commit 6fcb69dad579cc9a7dc15eabead43b6c37464f8c) --- Doc/library/multiprocessing.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/multiprocessing.rst b/Doc/library/multiprocessing.rst index d45bc20..04ce8d8 100644 --- a/Doc/library/multiprocessing.rst +++ b/Doc/library/multiprocessing.rst @@ -1018,7 +1018,7 @@ Connection objects are usually created using :func:`Pipe` -- see also .. method:: recv() Return an object sent from the other end of the connection using - :meth:`send`. Blocks until there its something to receive. Raises + :meth:`send`. Blocks until there is something to receive. Raises :exc:`EOFError` if there is nothing left to receive and the other end was closed. -- cgit v0.12 From f6306e737203ac1bf1717bbf62bc58dac24b68db Mon Sep 17 00:00:00 2001 From: Mariatta Date: Mon, 31 Jul 2017 19:53:43 -0700 Subject: bpo-25910: Update LICENSE (GH-2873) (GH-2968) Use the copy provided in https://bugs.python.org/issue25910GH-msg295200 (cherry picked from commit 8474d87165593bac2bc231287f42c4cff3fd6aaf) --- LICENSE | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/LICENSE b/LICENSE index f5d0b39..529349e 100644 --- a/LICENSE +++ b/LICENSE @@ -13,12 +13,11 @@ software. In May 2000, Guido and the Python core development team moved to BeOpen.com to form the BeOpen PythonLabs team. In October of the same -year, the PythonLabs team moved to Digital Creations (now Zope -Corporation, see http://www.zope.com). In 2001, the Python Software -Foundation (PSF, see http://www.python.org/psf/) was formed, a -non-profit organization created specifically to own Python-related -Intellectual Property. Zope Corporation is a sponsoring member of -the PSF. +year, the PythonLabs team moved to Digital Creations, which became +Zope Corporation. In 2001, the Python Software Foundation (PSF, see +https://www.python.org/psf/) was formed, a non-profit organization +created specifically to own Python-related Intellectual Property. +Zope Corporation was a sponsoring member of the PSF. All Python releases are Open Source (see http://www.opensource.org for the Open Source Definition). Historically, most, but not all, Python -- cgit v0.12 From 27ea3c782f0cc67805a3486336ce71f3ae08ba8a Mon Sep 17 00:00:00 2001 From: Mariatta Date: Mon, 31 Jul 2017 21:34:47 -0700 Subject: Remove .mention-bot (GH-2923) (GH-2971) (cherry picked from commit e1e60bd95c376f9b18cbaf9481364281c6cc1bc7) --- .mention-bot | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .mention-bot diff --git a/.mention-bot b/.mention-bot deleted file mode 100644 index cb53b99..0000000 --- a/.mention-bot +++ /dev/null @@ -1,3 +0,0 @@ -{ - "findPotentialReviewers": false -} -- cgit v0.12