Python 3.9.9v3.9.9

13 files changed, 86 insertions, 20 deletions

diff --git a/.gitignore b/.gitignore
index d0b608892a8..864152451dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -134,3 +134,7 @@ Tools/ssl/win32
 # Ignore ./python binary on Unix but still look into ./Python/ directory.
 /python
 !/Python/
+
+# Artifacts generated by 3.11 lying around when switching branches:
+/Programs/_freeze_module
+/Python/frozen_modules/ 
\ No newline at end of file
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 59741719c21..293e51a25d0 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -18,12 +18,12 @@
 /*--start constants--*/
 #define PY_MAJOR_VERSION        3
 #define PY_MINOR_VERSION        9
-#define PY_MICRO_VERSION        8
+#define PY_MICRO_VERSION        9
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_FINAL
 #define PY_RELEASE_SERIAL       0
 
 /* Version as a string */
-#define PY_VERSION              "3.9.8+"
+#define PY_VERSION              "3.9.9"
 /*--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 8567e304a09..890a61668df 100644
--- a/Lib/pydoc_data/topics.py
+++ b/Lib/pydoc_data/topics.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Autogenerated by Sphinx on Fri Nov  5 20:19:23 2021
+# Autogenerated by Sphinx on Mon Nov 15 18:21:10 2021
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
            '\n'
diff --git a/Misc/NEWS.d/3.9.9.rst b/Misc/NEWS.d/3.9.9.rst
new file mode 100644
index 00000000000..86a11a73765
--- /dev/null
+++ b/Misc/NEWS.d/3.9.9.rst
@@ -0,0 +1,78 @@
+.. bpo: 45738
+.. date: 2021-11-14-00-14-45
+.. nonce: e0cgKd
+.. release date: 2021-11-15
+.. section: Core and Builtins
+
+Fix computation of error location for invalid continuation characters in the
+parser. Patch by Pablo Galindo.
+
+..
+
+.. bpo: 45235
+.. date: 2021-11-11-13-03-17
+.. nonce: 8ZbkHa
+.. section: Library
+
+Reverted an argparse bugfix that caused regression in the handling of
+default arguments for subparsers.  This prevented leaf level arguments from
+taking precedence over root level arguments.
+
+..
+
+.. bpo: 45765
+.. date: 2021-11-09-09-04-19
+.. nonce: JVobxK
+.. section: Library
+
+In importlib.metadata, fix distribution discovery for an empty path.
+
+..
+
+.. bpo: 45644
+.. date: 2021-11-06-17-47-46
+.. nonce: ZMqHD_
+.. section: Library
+
+In-place JSON file formatting using ``python3 -m json.tool infile infile``
+now works correctly, previously it left the file empty.  Patch by Chris
+Wesseling.
+
+..
+
+.. bpo: 45772
+.. date: 2021-11-09-13-10-55
+.. nonce: EdrM3t
+.. section: Documentation
+
+``socket.socket`` documentation is corrected to a class from a function.
+
+..
+
+.. bpo: 45392
+.. date: 2021-11-06-10-54-17
+.. nonce: JZnVOz
+.. section: Documentation
+
+Update the docstring of the :class:`type` built-in to remove a redundant
+line and to mention keyword arguments for the constructor.
+
+..
+
+.. bpo: 45732
+.. date: 2021-11-08-21-53-11
+.. nonce: idl5kx
+.. section: Windows
+
+Updates bundled Tcl/Tk to 8.6.12.
+
+..
+
+.. bpo: 45720
+.. date: 2021-11-05-01-05-46
+.. nonce: 47Nc5I
+.. section: Windows
+
+Internal reference to :file:`shlwapi.dll` was dropped to help improve
+startup time. This DLL will no longer be loaded at the start of every Python
+process.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-11-14-00-14-45.bpo-45738.e0cgKd.rst b/Misc/NEWS.d/next/Core and Builtins/2021-11-14-00-14-45.bpo-45738.e0cgKd.rst
deleted file mode 100644
index b238034323c..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-11-14-00-14-45.bpo-45738.e0cgKd.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix computation of error location for invalid continuation characters in the
-parser. Patch by Pablo Galindo.
diff --git a/Misc/NEWS.d/next/Documentation/2021-11-06-10-54-17.bpo-45392.JZnVOz.rst b/Misc/NEWS.d/next/Documentation/2021-11-06-10-54-17.bpo-45392.JZnVOz.rst
deleted file mode 100644
index 09c16578ff4..00000000000
--- a/Misc/NEWS.d/next/Documentation/2021-11-06-10-54-17.bpo-45392.JZnVOz.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Update the docstring of the :class:`type` built-in to remove a redundant
-line and to mention keyword arguments for the constructor.
diff --git a/Misc/NEWS.d/next/Documentation/2021-11-09-13-10-55.bpo-45772.EdrM3t.rst b/Misc/NEWS.d/next/Documentation/2021-11-09-13-10-55.bpo-45772.EdrM3t.rst
deleted file mode 100644
index 47679521df3..00000000000
--- a/Misc/NEWS.d/next/Documentation/2021-11-09-13-10-55.bpo-45772.EdrM3t.rst
+++ /dev/null
@@ -1 +0,0 @@
-``socket.socket`` documentation is corrected to a class from a function.
diff --git a/Misc/NEWS.d/next/Library/2021-11-06-17-47-46.bpo-45644.ZMqHD_.rst b/Misc/NEWS.d/next/Library/2021-11-06-17-47-46.bpo-45644.ZMqHD_.rst
deleted file mode 100644
index 2cf4eae02c4..00000000000
--- a/Misc/NEWS.d/next/Library/2021-11-06-17-47-46.bpo-45644.ZMqHD_.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-In-place JSON file formatting using ``python3 -m json.tool infile infile``
-now works correctly, previously it left the file empty.  Patch by Chris
-Wesseling.
diff --git a/Misc/NEWS.d/next/Library/2021-11-09-09-04-19.bpo-45765.JVobxK.rst b/Misc/NEWS.d/next/Library/2021-11-09-09-04-19.bpo-45765.JVobxK.rst
deleted file mode 100644
index a1f4a1f7aa9..00000000000
--- a/Misc/NEWS.d/next/Library/2021-11-09-09-04-19.bpo-45765.JVobxK.rst
+++ /dev/null
@@ -1 +0,0 @@
-In importlib.metadata, fix distribution discovery for an empty path.
diff --git a/Misc/NEWS.d/next/Library/2021-11-11-13-03-17.bpo-45235.8ZbkHa.rst b/Misc/NEWS.d/next/Library/2021-11-11-13-03-17.bpo-45235.8ZbkHa.rst
deleted file mode 100644
index f73589ccc88..00000000000
--- a/Misc/NEWS.d/next/Library/2021-11-11-13-03-17.bpo-45235.8ZbkHa.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Reverted an argparse bugfix that caused regression in the handling of
-default arguments for subparsers.  This prevented leaf level arguments from
-taking precedence over root level arguments.
diff --git a/Misc/NEWS.d/next/Windows/2021-11-05-01-05-46.bpo-45720.47Nc5I.rst b/Misc/NEWS.d/next/Windows/2021-11-05-01-05-46.bpo-45720.47Nc5I.rst
deleted file mode 100644
index 315759b07e1..00000000000
--- a/Misc/NEWS.d/next/Windows/2021-11-05-01-05-46.bpo-45720.47Nc5I.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Internal reference to :file:`shlwapi.dll` was dropped to help improve
-startup time. This DLL will no longer be loaded at the start of every Python
-process.
diff --git a/Misc/NEWS.d/next/Windows/2021-11-08-21-53-11.bpo-45732.idl5kx.rst b/Misc/NEWS.d/next/Windows/2021-11-08-21-53-11.bpo-45732.idl5kx.rst
deleted file mode 100644
index 563bcd33a40..00000000000
--- a/Misc/NEWS.d/next/Windows/2021-11-08-21-53-11.bpo-45732.idl5kx.rst
+++ /dev/null
@@ -1 +0,0 @@
-Updates bundled Tcl/Tk to 8.6.12.
diff --git a/README.rst b/README.rst
index ef78796301d..b808463b712 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-This is Python version 3.9.8
+This is Python version 3.9.9
 ============================
 
 .. image:: https://travis-ci.org/python/cpython.svg?branch=3.9