From 1f2e3088f3c097b5bde69bbd63dfcd0852d31984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
Date: Sun, 4 Apr 2021 13:04:49 +0200
Subject: [PATCH] Python 3.9.4
---
Include/patchlevel.h | 4 ++--
Lib/pydoc_data/topics.py | 2 +-
Misc/NEWS.d/3.9.4.rst | 21 +++++++++++++++++++
.../2021-04-03-21-12-15.bpo-43710._Mj01v.rst | 4 ----
.../2020-09-01-10-12-13.bpo-26053.hXikw_.rst | 1 -
README.rst | 2 +-
6 files changed, 25 insertions(+), 9 deletions(-)
create mode 100644 Misc/NEWS.d/3.9.4.rst
delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2021-04-03-21-12-15.bpo-43710._Mj01v.rst
delete mode 100644 Misc/NEWS.d/next/Library/2020-09-01-10-12-13.bpo-26053.hXikw_.rst
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index e4dc226cbcd..cf76d874307 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 3
+#define PY_MICRO_VERSION 4
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
#define PY_RELEASE_SERIAL 0
/* Version as a string */
-#define PY_VERSION "3.9.3+"
+#define PY_VERSION "3.9.4"
/*--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 eb5b8936c06..e3b6f14e4f2 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 Apr 2 11:48:03 2021
+# Autogenerated by Sphinx on Sun Apr 4 14:53:49 2021
topics = {'assert': 'The "assert" statement\n'
'**********************\n'
'\n'
diff --git a/Misc/NEWS.d/3.9.4.rst b/Misc/NEWS.d/3.9.4.rst
new file mode 100644
index 00000000000..15c28291875
--- /dev/null
+++ b/Misc/NEWS.d/3.9.4.rst
@@ -0,0 +1,21 @@
+.. bpo: 43710
+.. date: 2021-04-03-21-12-15
+.. nonce: _Mj01v
+.. release date: 2021-04-04
+.. section: Core and Builtins
+
+Reverted the fix for https://bugs.python.org/issue42500 as it changed the
+PyThreadState struct size and broke the 3.9.x ABI in the 3.9.3 release
+(visible on 32-bit platforms using binaries compiled using an earlier
+version of Python 3.9.x headers).
+
+..
+
+.. bpo: 26053
+.. date: 2020-09-01-10-12-13
+.. nonce: hXikw_
+.. section: Library
+
+Fixed bug where the :mod:`pdb` interactive run command echoed the args from
+the shell command line, even if those have been overridden at the pdb
+prompt.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-04-03-21-12-15.bpo-43710._Mj01v.rst b/Misc/NEWS.d/next/Core and Builtins/2021-04-03-21-12-15.bpo-43710._Mj01v.rst
deleted file mode 100644
index cc32efc5439..00000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-04-03-21-12-15.bpo-43710._Mj01v.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Reverted the fix for https://bugs.python.org/issue42500 as it changed the
-PyThreadState struct size and broke the 3.9.x ABI in the 3.9.3 release
-(visible on 32-bit platforms using binaries compiled using an earlier
-version of Python 3.9.x headers).
diff --git a/Misc/NEWS.d/next/Library/2020-09-01-10-12-13.bpo-26053.hXikw_.rst b/Misc/NEWS.d/next/Library/2020-09-01-10-12-13.bpo-26053.hXikw_.rst
deleted file mode 100644
index e8720ac82ff..00000000000
--- a/Misc/NEWS.d/next/Library/2020-09-01-10-12-13.bpo-26053.hXikw_.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed bug where the :mod:`pdb` interactive run command echoed the args from the shell command line, even if those have been overridden at the pdb prompt.
diff --git a/README.rst b/README.rst
index ae7f264ef4f..f62e3b3664f 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-This is Python version 3.9.3
+This is Python version 3.9.4
============================
.. image:: https://travis-ci.org/python/cpython.svg?branch=3.9
--
GitLab