Merge branch 'master' of https://github.com/sblondon/cpython into mailbox_with_context_manager

Author: sblondon

.gitattributes

@@ -26,6 +26,7 @@ Lib/test/decimaltestdata/*.decTest -text
 Lib/test/test_email/data/*.txt -text
 Lib/test/xmltestdata/* -text
 Lib/test/coding20731.py -text
+Lib/test/test_importlib/data01/* -text
 
 # CRLF files
 *.bat text eol=crlf

.github/CODEOWNERS

@@ -5,17 +5,24 @@
 # https://git-scm.com/docs/gitignore#_pattern_format
 
 # asyncio
-**/*asyncio*                  @1st1
+**/*asyncio*                  @1st1 @asvetlov
 
 # Core
+**/*context*                  @1st1
 **/*genobject*                @1st1
+**/*hamt*                     @1st1
 
 # Hashing
 **/*hashlib*                  @python/crypto-team
 **/*pyhash*                   @python/crypto-team
 
-# Import (including importlib)
-**/*import*                   @python/import-team
+# Import (including importlib).
+# Ignoring importlib.h so as to not get flagged on
+# all pull requests that change the the emitted
+# bytecode.
+**/*import*.c                 @python/import-team
+**/*import*.py                @python/import-team
+
 
 # SSL
 **/*ssl*                      @python/crypto-team
@@ -50,4 +57,8 @@ Python/bootstrap_hash.c       @python/crypto-team
 **/*functools*                @ncoghlan @rhettinger
 **/*decimal*                  @rhettinger @skrah
 
+**/*dataclasses*              @ericvsmith
+
 **/*idlelib*                  @terryjreedy
+
+**/*typing*                   @gvanrossum @ilevkivskyi

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,20 @@
-!!! If this is a backport PR (PR made against branches other than `master`),
+<!--
+Thanks for your contribution!
+Please read this comment in its entirety. It's quite important.
+
+# Pull Request title
+
+It should be in the following format:
+```
+bpo-NNNN: Summary of the changes made
+```
+Where: bpo-NNNN refers to the issue number in the https://bugs.python.org.
+
+Most PRs will require an issue number. Trivial changes, like fixing a typo, do not need an issue.
+
+# Backport Pull Request title
+
+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)
@@ -7,4 +23,4 @@ Where: [X.Y] is the branch name, e.g. [3.6].
 
 GH-NNNN refers to the PR number from `master`.
 
-PLEASE: Remove this headline!!!
+-->

.github/appveyor.yml

@@ -1,35 +1,37 @@
-version: 3.7.0a0.{build}
+version: 3.8build{build}
 clone_depth: 5
 branches:
   only:
     - master
     - /\d\.\d/
     - buildbot-custom
 cache:
-  - externals -> PCbuild\*
+  - externals -> PCbuild
+before_build:
+  - ps: |+
+      if ($env:APPVEYOR_RE_BUILD) {
+        echo 'Doing full build due to re-build request.'
+      } elseif (!$env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT) {
+        echo 'Not a PR, doing full build.'
+      } else {
+        git fetch -q origin +refs/heads/$env:APPVEYOR_REPO_BRANCH
+        $mergebase = git merge-base HEAD FETCH_HEAD
+        $changes = git diff --name-only HEAD $mergebase | grep -vE '(\.rst$)|(^Doc)|(^Misc)'
+        If (!$changes) {
+          echo 'Only docs were updated, stopping build process.'
+          Exit-AppveyorBuild
+        }
+        echo 'Doing full build due to non-doc changes in these files:'
+        echo $changes
+      }
+
+
 build_script:
-- cmd: PCbuild\build.bat -e
-- cmd: PCbuild\win32\python.exe -m test.pythoninfo
+  - 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
+  - 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:
-  files:
-    - .github/appveyor.yml
-    - .gitattributes
-    - Grammar/
-    - Include/
-    - Lib/
-    - Modules/
-    - Objects/
-    - PC/
-    - PCbuild/
-    - Parser/
-    - Programs/
-    - Python/
-    - Tools/

.gitignore

@@ -1,3 +1,10 @@
+# added for local development
+.buildaix/
+Modules/python.exp
+buildaix/
+installp/
+.gitignore
+
 # Two-trick pony for OSX and other case insensitive file systems:
 # Ignore ./python binary on Unix but still look into ./Python/ directory.
 /python
@@ -106,3 +113,5 @@ Tools/ssl/amd64
 Tools/ssl/win32
 .vs/
 .vscode/
+gmon.out
+.mypy_cache/