python · cjrh · Sep 30, 2017 · Sep 30, 2017 · Oct 1, 2017 · Oct 1, 2017
diff --git a/.gitattributes b/.gitattributes
@@ -27,9 +27,6 @@ Lib/test/test_email/data/*.txt -text
 Lib/test/xmltestdata/* -text
 Lib/test/coding20731.py -text
 
-# Special files in third party code
-Modules/zlib/zlib.map -text
-
 # CRLF files
 *.bat text eol=crlf
 *.ps1 text eol=crlf

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -0,0 +1,53 @@
+# See https://help.github.com/articles/about-codeowners/
+# for more info about CODEOWNERS file
+
+# It uses the same pattern rule for gitignore file
+# https://git-scm.com/docs/gitignore#_pattern_format
+
+# asyncio
+**/*asyncio*                  @1st1
+
+# Core
+**/*genobject*                @1st1
+
+# Hashing
+**/*hashlib*                  @python/crypto-team
+**/*pyhash*                   @python/crypto-team
+
+# Import (including importlib)
+**/*import*                   @python/import-team
+
+# SSL
+**/*ssl*                      @python/crypto-team
+
+# CSPRNG
+Python/bootstrap_hash.c       @python/crypto-team
+
+# Email and related
+**/*mail*                     @python/email-team
+**/*smtp*                     @python/email-team
+**/*mime*                     @python/email-team
+**/*imap*                     @python/email-team
+**/*poplib*                   @python/email-team
+
+# subprocess
+**/*subprocess*               @gpshead
+
+# Windows
+/PC/                          @python/windows-team
+/PCbuild/                     @python/windows-team
+
+# Windows installer packages
+/Tools/msi/                   @python/windows-team
+/Tools/nuget/                 @python/windows-team
+
+**/*itertools*                @rhettinger
+**/*collections*              @rhettinger
+**/*random*                   @rhettinger
+**/*queue*                    @rhettinger
+**/*bisect*                   @rhettinger
+**/*heapq*                    @rhettinger
+**/*functools*                @ncoghlan @rhettinger
+**/*decimal*                  @rhettinger @skrah
+
+**/*idlelib*                  @terryjreedy
diff --git a/.github/CODE_OF_CONDUCT.rst b/.github/CODE_OF_CONDUCT.rst
@@ -0,0 +1,14 @@
+Code of Conduct
+===============
+
+Please note that all interactions on
+`Python Software Foundation <https://www.python.org/psf-landing/>`__-supported
+infrastructure is `covered
+<https://www.python.org/psf/records/board/minutes/2014-01-06/#management-of-the-psfs-web-properties>`__
+by the `PSF Code of Conduct <https://www.python.org/psf/codeofconduct/>`__,
+which includes all infrastructure used in the development of Python itself
+(e.g. mailing lists, issue trackers, GitHub, etc.).
+
+In general this means everyone is expected to be open, considerate, and
+respectful of others no matter what their position is within the project.
+
diff --git a/.github/CONTRIBUTING.rst b/.github/CONTRIBUTING.rst
@@ -12,31 +12,47 @@ Build Status
 
   + `Stable buildbots <http://buildbot.python.org/3.6.stable/>`_
 
-- 3.5
-
-  + `Stable buildbots <http://buildbot.python.org/3.5.stable/>`_
-
 - 2.7
 
   + `Stable buildbots <http://buildbot.python.org/2.7.stable/>`_
 
 
+Thank You
+---------
+First off, thanks for contributing to the maintenance of the Python programming
+language and the CPython interpreter! Even if your contribution is not
+ultimately accepted, the fact you put time and effort into helping out is
+greatly appreciated.
+
+
 Contribution Guidelines
 -----------------------
-Please read the `devguide <https://cpython-devguide.readthedocs.io/>`_ for
+Please read the `devguide <https://devguide.python.org/>`_ for
 guidance on how to contribute to this project. The documentation covers
 everything from how to build the code to submitting a pull request. There are
 also suggestions on how you can most effectively help the project.
 
 Please be aware that our workflow does deviate slightly from the typical GitHub
 project. Details on how to properly submit a pull request are covered in
-`Lifecycle of a Pull Request <https://cpython-devguide.readthedocs.io/pullrequest.html>`_.
-One key point is to keep comments on GitHub to only those related to the reviewing
-the code in the pull request. All other discussions -- e.g. about the issue being
-fixed -- should happen on bugs.python.org.
-
-If you are making a code contribution or large documentation contribution,
-please feel free to add yourself to the ``Misc/ACKS`` file alphabetically.
+`Lifecycle of a Pull Request <https://devguide.python.org/pullrequest/>`_.
+We utilize various bots and status checks to help with this, so do follow the
+comments they leave and their "Details" links, respectively. The key points of
+our workflow that are not covered by a bot or status check are:
+
+- All discussions that are not directly related to the code in the pull request
+  should happen on bugs.python.org
+- Upon your first non-trivial pull request (which includes documentation changes),
+  feel free to add yourself to ``Misc/ACKS``
+
+
+Setting Expectations
+--------------------
+Due to the fact that this project is entirely volunteer-run (i.e. no one is paid
+to work on Python full-time), we unfortunately can make no guarantees as to if
+or when a core developer will get around to reviewing your pull request.
+If no core developer has done a review or responded to changes made because of a
+"changes requested" review, please feel free to email python-dev to ask if
+someone could take a look at your pull request.
 
 
 Code of Conduct

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,10 @@
+!!! If this is a backport PR (PR made against branches other than `master`),
+please ensure that the PR title is in the following format:
+```
+[X.Y] <title from the original PR> (GH-NNNN)
+```
+Where: [X.Y] is the branch name, e.g. [3.6].
+
+GH-NNNN refers to the PR number from `master`.
+
+PLEASE: Remove this headline!!!
diff --git a/.github/appveyor.yml b/.github/appveyor.yml
@@ -5,12 +5,17 @@ branches:
     - master
     - /\d\.\d/
     - buildbot-custom
+cache:
+  - externals -> PCbuild\*
 build_script:
 - cmd: PCbuild\build.bat -e
+- cmd: PCbuild\win32\python.exe -m test.pythoninfo
 test_script:
 - cmd: PCbuild\rt.bat -q -uall -u-cpu -rwW --slowest --timeout=1200 --fail-env-changed -j0
 environment:
   HOST_PYTHON: C:\Python36\python.exe
+image:
+- Visual Studio 2017
 
 # Only trigger AppVeyor if actual code or its configuration changes
 only_commits:
@@ -23,7 +28,7 @@ only_commits:
     - Modules/
     - Objects/
     - PC/
-    - PCBuild/
+    - PCbuild/
     - Parser/
     - Programs/
     - Python/

diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,9 @@
 .gdb_history
 Doc/build/
 Doc/venv/
+Doc/.venv/
+Doc/env/
+Doc/.env/
 Include/pydtrace_probes.h
 Lib/distutils/command/*.pdb
 Lib/lib2to3/*.pickle

diff --git a/.mention-bot b/.mention-bot
diff --git a/.travis.yml b/.travis.yml
@@ -3,8 +3,10 @@ dist: trusty
 sudo: false
 group: beta
 
-# To cache doc-building dependencies.
-cache: pip
+# To cache doc-building dependencies and C compiler output.
+cache:
+    - pip
+    - ccache
 
 branches:
   only:
@@ -23,15 +25,6 @@ matrix:
       # compiler here and the other to run the coverage build. Clang is preferred
       # in this instance for its better error messages.
       env: TESTING=cpython
-    - os: osx
-      language: c
-      compiler: clang
-      # Testing under macOS is optional until testing stability has been demonstrated.
-      env: OPTIONAL=true
-      before_install:
-        - brew install openssl xz
-        - export CPPFLAGS="-I$(brew --prefix openssl)/include"
-        - export LDFLAGS="-L$(brew --prefix openssl)/lib"
     - os: linux
       language: python
       # Build the docs against a stable version of Python so code bugs don't hold up doc-related PRs.
@@ -41,9 +34,9 @@ matrix:
         - cd Doc
         # Sphinx is pinned so that new versions that introduce new warnings won't suddenly cause build failures.
         # (Updating the version is fine as long as no warnings are raised by doing so.)
-        - python -m pip install sphinx~=1.6.1
+        - python -m pip install sphinx~=1.6.1 blurb
       script:
-        - make check suspicious html SPHINXOPTS="-q -W -j4"
+        - make check suspicious html SPHINXBUILD="sphinx-build" SPHINXOPTS="-q -W -j4"
     - os: linux
       language: c
       compiler: gcc
@@ -60,9 +53,10 @@ matrix:
             # Need a venv that can parse covered code.
             ./python -m venv venv
             ./venv/bin/python -m pip install -U coverage
+            ./venv/bin/python -m test.pythoninfo
       script:
         # Skip tests that re-run the entire test suite.
-        - ./venv/bin/python -m coverage run --pylib -m test -uall,-cpu -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_multiprocessing_spawn
+        - ./venv/bin/python -m coverage run --pylib -m test --fail-env-changed -uall,-cpu -x test_multiprocessing_fork -x test_multiprocessing_forkserver -x test_multiprocessing_spawn -x test_concurrent_futures
       after_script:  # Probably should be after_success once test suite updated to run under coverage.py.
         # Make the `coverage` command available to Codecov w/ a version of Python that can parse all source files.
         - source ./venv/bin/activate
@@ -87,6 +81,7 @@ before_script:
         echo "$changes"
         exit 1
       fi
+      make pythoninfo
 
 script:
   # Using the built Python as patchcheck.py is built around the idea of using
@@ -96,6 +91,8 @@ script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then ./python Tools/scripts/patchcheck.py --travis $TRAVIS_PULL_REQUEST; fi
   # `-r -w` implicitly provided through `make buildbottest`.
   - make buildbottest TESTOPTS="-j4 -uall,-cpu"
+  # Check that all symbols exported by libpython start with "Py" or "_Py"
+  - make smelly
 
 notifications:
   email: false

diff --git a/Doc/Makefile b/Doc/Makefile
@@ -5,7 +5,15 @@
 
 # You can set these variables from the command line.
 PYTHON       = python3
+<<<<<<< HEAD
+VENVDIR      = ./venv
+SPHINXBUILD  = PATH=$(VENVDIR)/bin:$$PATH sphinx-build
+BLURB        = PATH=$(VENVDIR)/bin:$$PATH blurb
+||||||| merged common ancestors
 SPHINXBUILD  = sphinx-build
+=======
+SPHINXBUILD  = ./venv/bin/sphinx-build
+>>>>>>> 9a3d158180169c92aea2f781194869098e8b1f25
 PAPER        =
 SOURCES      =
 DISTVERSION  = $(shell $(PYTHON) tools/extensions/patchlevel.py)
@@ -15,7 +23,7 @@ ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_elements.papersize=$(PA
 
 .PHONY: help build html htmlhelp latex text changes linkcheck \
 	suspicious coverage doctest pydoc-topics htmlview clean dist check serve \
-	autobuild-dev autobuild-stable venv
+	autobuild-dev autobuild-stable
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -37,7 +45,28 @@ help:
 	@echo "  check      to run a check for frequent markup errors"
 	@echo "  serve      to serve the documentation on the localhost (8000)"
 
+<<<<<<< HEAD
 build:
+	venv
+	-mkdir -p build
+# 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
+||||||| merged common ancestors
+build:
+=======
+build: venv
+>>>>>>> 9a3d158180169c92aea2f781194869098e8b1f25
 	$(SPHINXBUILD) $(ALLSPHINXOPTS)
 	@echo
 
@@ -103,11 +132,14 @@ htmlview: html
 	 $(PYTHON) -c "import webbrowser; webbrowser.open('build/html/index.html')"
 
 clean:
-	-rm -rf build/* venv/*
+	-rm -rf build/* $(VENVDIR)/*
 
 venv:
-	$(PYTHON) -m venv venv
-	./venv/bin/python3 -m pip install -U Sphinx
+	@if [ "$(SPHINXBUILD)" == "$(VENVDIR)/bin/sphinx-build" ]; then \
+		@echo "The venv has been created in the $(VENVDIR) directory"
+		$(PYTHON) -m venv $(VENVDIR); \
+		$(VENVDIR)/bin/python3 -m pip install -U Sphinx blurb; \
+	fi
 
 dist:
 	rm -rf dist
@@ -153,7 +185,7 @@ dist:
 	cp -pPR build/epub/Python.epub dist/python-$(DISTVERSION)-docs.epub
 
 check:
-	$(PYTHON) tools/rstlint.py -i tools -i venv -i README.rst
+	$(PYTHON) tools/rstlint.py -i tools -i $(VENVDIR) -i README.rst
 
 serve:
 	../Tools/scripts/serve.py build/html
@@ -167,12 +199,12 @@ serve:
 
 # for development releases: always build
 autobuild-dev:
-	make dist SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A versionswitcher=1'
+	make dist SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A switchers=1'
 	-make suspicious
 
 # for quick rebuilds (HTML only)
 autobuild-dev-html:
-	make html SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A versionswitcher=1'
+	make html SPHINXOPTS='$(SPHINXOPTS) -Ea -A daily=1 -A switchers=1'
 
 # for stable releases: only build if not in pre-release stage (alpha, beta)
 # release candidate downloads are okay, since the stable tree can be in that stage