From 9c4347ef8b60f54dd357fd6b2f5ca9edc5105e2a Mon Sep 17 00:00:00 2001
From: Thomas Wouters <thomas@python.org>
Date: Wed, 22 Nov 2023 11:43:55 +0100
Subject: [PATCH 01/18] Python 3.13.0a2

---
 Include/patchlevel.h                          |    4 +-
 Lib/pydoc_data/topics.py                      |   44 +-
 Misc/NEWS.d/3.13.0a2.rst                      | 1622 +++++++++++++++++
 ...3-10-17-01-56-11.gh-issue-85283.V156T2.rst |    5 -
 ...-10-17-03-10-40.gh-issue-110828.31vQ9B.rst |    1 -
 ...-10-20-15-29-31.gh-issue-111046.2DxQl8.rst |    1 -
 ...-11-15-13-40-29.gh-issue-112088.UJQxxh.rst |    5 -
 ...3-11-15-16-56-20.gh-issue-96954.6FYvKn.rst |    1 -
 ...3-06-08-21-12-44.gh-issue-67565.UkK3x-.rst |    1 -
 ...-07-12-12-14-52.gh-issue-106672.fkRjmi.rst |    5 -
 ...3-08-28-17-34-10.gh-issue-85283.f1zXcc.rst |    3 -
 ...3-08-28-17-40-51.gh-issue-85283.raFNiD.rst |    2 -
 ...-10-02-23-08-53.gh-issue-109587.UqqnDY.rst |    2 -
 ...-10-13-14-18-06.gh-issue-110815.tEFLVl.rst |    1 -
 ...-10-17-10-21-59.gh-issue-110964.OxqEjd.rst |    2 -
 ...-10-19-22-39-24.gh-issue-108082.uJytvc.rst |    1 -
 ...-10-30-18-13-01.gh-issue-111506.EUdO22.rst |    2 -
 ...-10-31-14-58-17.gh-issue-111569._V8iu4.rst |    3 -
 ...-10-31-18-22-03.gh-issue-108765._beYv8.rst |    3 -
 ...-11-08-18-37-19.gh-issue-111138.3Ypq8h.rst |    2 -
 ...-11-08-20-28-03.gh-issue-111863.RPeFAX.rst |    1 -
 ...-11-10-10-21-38.gh-issue-111262.2utB5m.rst |    4 -
 ...-11-10-10-24-28.gh-issue-111956.ImE6Cx.rst |    2 -
 ...-11-13-17-57-11.gh-issue-112026.WJLJcI.rst |    3 -
 ...-11-15-16-07-57.gh-issue-112026.bnr8dd.rst |   51 -
 ...-11-15-17-10-09.gh-issue-112026.ts9yyn.rst |    2 -
 ...-11-15-18-36-21.gh-issue-112026._Yybr5.rst |    3 -
 .../2021-11-10-10-40-05.bpo-45759.WJoB3D.rst  |    1 -
 ...-12-27-02-51-45.gh-issue-100445.C8f6ph.rst |    1 -
 ...-07-20-11-41-16.gh-issue-106905.AyZpuB.rst |    1 -
 ...-08-31-11-42-16.gh-issue-106718._-57DA.rst |    2 -
 .../2023-09-06-12-36-11.bpo-46657.xea1T_.rst  |    1 -
 ...-09-15-23-39-43.gh-issue-103615.WZavly.rst |    1 -
 ...3-09-30-17-30-11.gh-issue-89519.hz2pZf.rst |    6 -
 ...-10-09-19-54-33.gh-issue-110543.1wrxO8.rst |    3 -
 ...-10-12-12-09-01.gh-issue-110481.3Er3it.rst |    1 -
 ...-10-12-17-15-23.gh-issue-110722.sjMwQe.rst |    3 -
 ...-10-13-09-21-29.gh-issue-110805.vhU7A7.rst |    2 -
 ...-10-13-16-55-55.gh-issue-109094.ziL4cJ.rst |    3 -
 ...-10-14-12-19-34.gh-issue-110864.-baPDE.rst |    2 -
 ...-10-15-20-45-35.gh-issue-110892.oA6eVY.rst |    1 -
 ...-10-15-22-18-45.gh-issue-109894.UAmo06.rst |    1 -
 ...-10-16-12-12-48.gh-issue-110912.uEJGi_.rst |    2 -
 ...-10-16-15-51-37.gh-issue-109214.-RGTFH.rst |    1 -
 ...-10-17-11-03-45.gh-issue-110938.X3sbMb.rst |    2 -
 ...-10-20-23-14-06.gh-issue-111123.jjVc3M.rst |    2 -
 ...3-10-23-15-44-47.gh-issue-67224.S4D6CR.rst |    2 -
 ...3-10-23-22-11-09.gh-issue-94438.y2pITu.rst |    1 -
 ...-10-26-18-45-20.gh-issue-111354.GrT-Wf.rst |    3 -
 ...-10-27-11-22-09.gh-issue-111374.e9lrPZ.rst |    3 -
 ...-10-27-11-51-40.gh-issue-111380.vgSbir.rst |    2 -
 ...-10-27-12-17-49.gh-issue-111366._TSknV.rst |    3 -
 ...-10-27-19-38-33.gh-issue-102388.vd5YUZ.rst |    1 -
 ...-10-29-11-35-21.gh-issue-111435.ageUWQ.rst |    2 -
 ...-10-29-12-33-33.gh-issue-111438.bHTLLl.rst |    2 -
 ...-10-29-20-11-21.gh-issue-111420.IUT-GK.rst |    1 -
 ...-10-31-14-25-21.gh-issue-109181.11h6Mc.rst |    2 -
 ...-10-31-21-33-35.gh-issue-111520.vw-rxJ.rst |    9 -
 ...-11-02-14-49-19.gh-issue-111354.gIS3f-.rst |    5 -
 ...-11-02-15-00-57.gh-issue-111623.BZxYc8.rst |    2 -
 ...-11-03-01-04-55.gh-issue-111654.scUhDO.rst |    2 -
 ...-11-03-01-23-48.gh-issue-111666.l8Q8G5.rst |    3 -
 ...-11-03-19-25-38.gh-issue-111772.aRQvOn.rst |    1 -
 ...-11-03-22-48-29.gh-issue-109369.ELYaxJ.rst |    1 -
 ...-11-04-13-36-51.gh-issue-110829.Pa0CJI.rst |    1 -
 ...-11-05-06-40-35.gh-issue-111843.c045cB.rst |    2 -
 ...3-11-05-20-59-10.gh-issue-81925.wKHLSS.rst |    1 -
 ...3-11-06-16-44-09.gh-issue-79932.2qv7uD.rst |    1 -
 ...3-11-07-12-59-02.gh-issue-81137.qFpJCY.rst |    2 -
 ...-11-14-22-12-11.gh-issue-111916.ZGCayL.rst |    1 -
 ...-11-15-16-14-10.gh-issue-106529.Y48ax9.rst |    1 -
 ...-11-15-20-20-51.gh-issue-111798.cs-3t3.rst |    4 -
 ...-11-17-16-49-32.gh-issue-111807.QvjP9_.rst |    1 -
 ...-11-19-15-57-23.gh-issue-112266.BSJMbR.rst |    2 -
 ...-11-20-10-40-40.gh-issue-112287.15gWAK.rst |    3 -
 ...-11-20-14-13-02.gh-issue-112243.FKdQnr.rst |    1 -
 .../2019-01-07-06-18-25.bpo-35668.JimxP5.rst  |    4 -
 ...2-05-06-15-49-57.gh-issue-86826.rf006W.rst |    4 -
 ...2-05-28-20-55-07.gh-issue-73561.YRmAvy.rst |    1 -
 ...2-10-05-15-01-36.gh-issue-96954.ezwkrU.rst |    5 -
 ...2-10-14-21-11-10.gh-issue-97928.Pdxh1G.rst |    6 -
 ...-03-22-02-01-30.gh-issue-102895.HiEqaZ.rst |    1 -
 ...-04-15-14-45-21.gh-issue-102956.Z6qeUy.rst |    1 -
 ...3-04-26-16-37-00.gh-issue-90890.fIag4w.rst |    7 -
 ...3-05-30-02-01-14.gh-issue-90026.FyCXw8.rst |    1 -
 ...3-07-13-00-24-52.gh-issue-72904.Yn5-j0.rst |    2 -
 ...-07-29-19-00-39.gh-issue-107431.1GzJ2p.rst |    2 -
 ...-08-30-19-10-35.gh-issue-105931.Lpwve8.rst |    8 -
 ...-09-02-16-07-23.gh-issue-108791.fBcAqh.rst |    1 -
 ...3-09-08-12-10-10.gh-issue-85098.DfQbeJ.rst |    2 -
 ...-09-15-12-30-21.gh-issue-109466.6ah-aw.rst |    1 -
 ...-09-25-20-05-41.gh-issue-109747._cRJH8.rst |    3 -
 ...-10-02-05-23-27.gh-issue-110196.djwt0z.rst |    1 -
 ...-10-08-14-17-06.gh-issue-110395._tdCsV.rst |    2 -
 ...3-10-08-18-38-09.gh-issue-88434.2Q_IkG.rst |    3 -
 ...3-10-09-23-59-04.gh-issue-59013.qPbS-G.rst |    1 -
 ...-10-10-17-56-41.gh-issue-110392.6g6CnP.rst |    4 -
 ...-10-12-15-16-44.gh-issue-110774.AdCb5A.rst |    1 -
 ...-10-13-06-47-20.gh-issue-110771.opwdlc.rst |    1 -
 ...3-10-14-20-15-53.gh-issue-80675._M-cQC.rst |    1 -
 ...3-10-14-21-33-57.gh-issue-84583.-Cmn4_.rst |    1 -
 ...-10-15-08-08-26.gh-issue-110745.mxEkh0.rst |    2 -
 ...-10-16-18-41-51.gh-issue-110944.CmUKXo.rst |    1 -
 ...-10-19-22-46-34.gh-issue-111092.hgut12.rst |    1 -
 ...-10-20-15-29-10.gh-issue-110910.u2oPwX.rst |    3 -
 ...-10-21-13-57-06.gh-issue-111159.GoHp7s.rst |    1 -
 ...-10-22-21-28-05.gh-issue-111187._W11Ab.rst |    1 -
 ...-10-23-13-53-58.gh-issue-111174.Oohmzd.rst |    2 -
 ...-10-23-22-40-47.gh-issue-111230.k3Jm84.rst |    1 -
 ...-10-23-23-14-54.gh-issue-111233.sCdCC0.rst |    1 -
 ...-10-24-12-09-46.gh-issue-111251.urFYtn.rst |    1 -
 ...-10-24-12-20-46.gh-issue-111253.HFywSK.rst |    1 -
 ...-10-25-08-42-05.gh-issue-111295.H2K4lf.rst |    1 -
 ...-10-25-11-13-35.gh-issue-111259.z7ndeA.rst |    1 -
 ...3-10-25-11-54-00.gh-issue-79033.5ePgFl.rst |    6 -
 ...-10-27-09-56-20.gh-issue-111388.SlmDbC.rst |    2 -
 ...3-10-27-12-46-56.gh-issue-68166.0EbWW4.rst |    4 -
 ...-10-28-04-21-17.gh-issue-111342.m8Ln1k.rst |    1 -
 ...-10-28-22-11-11.gh-issue-111429.mJGxuQ.rst |    2 -
 ...3-10-29-03-46-27.gh-issue-66425.FWTdDo.rst |    3 -
 ...-10-30-08-50-46.gh-issue-111356.Bc8LvA.rst |    1 -
 ...-10-30-14-47-23.gh-issue-111246.QJ_ehs.rst |    2 -
 ...-10-31-07-46-56.gh-issue-111531.6zUV_G.rst |    2 -
 ...-11-01-14-03-24.gh-issue-110894.7-wZxC.rst |    1 -
 ...-11-02-12-15-46.gh-issue-111482.FWqZIU.rst |    3 -
 ...-11-04-01-20-23.gh-issue-111719.fUiKBD.rst |    1 -
 ...-11-04-10-24-25.gh-issue-111541.x0RBI1.rst |    1 -
 ...3-11-04-21-12-27.gh-issue-80731.Wq51xg.rst |    1 -
 ...-11-08-07-42-53.gh-issue-111768.g-WpnV.rst |    1 -
 ...-11-08-11-50-49.gh-issue-111841.iSqdQf.rst |    2 -
 ...-11-08-15-58-57.gh-issue-111804.uAXTOL.rst |    2 -
 ...-11-08-23-32-03.gh-issue-111835.ufFiuW.rst |    4 -
 ...-11-09-10-45-56.gh-issue-103791.sdfkja.rst |    3 -
 ...-11-09-12-57-43.gh-issue-111460.TQaz9I.rst |    3 -
 ...-11-10-22-08-28.gh-issue-111942.MDFm6v.rst |    2 -
 ...-11-11-16-42-48.gh-issue-109538.cMG5ux.rst |    1 -
 ...-11-14-16-31-59.gh-issue-111995.OoX8JJ.rst |    2 -
 ...-11-14-18-43-55.gh-issue-111942.x1pnrj.rst |    2 -
 ...-09-15-15-00-14.gh-issue-108747.ql0owS.rst |    2 -
 ...-10-16-13-47-24.gh-issue-110918.aFgZK3.rst |    4 -
 ...-10-17-17-54-36.gh-issue-110995.Fx8KRD.rst |    2 -
 ...-10-21-00-10-36.gh-issue-110932.jktjJU.rst |    2 -
 ...-10-21-19-27-36.gh-issue-111165.FU6mUk.rst |    2 -
 ...-10-31-22-09-25.gh-issue-110367.UhQi44.rst |    3 -
 ...-11-03-18-59-13.gh-issue-110722.jvT1pb.rst |    2 -
 ...-11-17-15-20-41.gh-issue-111808.jtIayt.rst |    4 -
 ...-11-09-13-04-29.gh-issue-111903.7Prryr.rst |    4 -
 ...-10-19-21-46-18.gh-issue-110913.CWlPfg.rst |    1 -
 ...-10-25-05-01-28.gh-issue-111293.FSsLT6.rst |    1 -
 ...-11-13-22-35-27.gh-issue-111856.vEtA5z.rst |    2 -
 ...3-08-30-16-33-57.gh-issue-92603.ATkKVO.rst |    3 -
 ...3-09-02-08-49-57.gh-issue-71383.Ttkchg.rst |    2 -
 ...-10-18-01-40-36.gh-issue-111015.NaLI2L.rst |    1 -
 ...-10-18-17-26-36.gh-issue-110950.sonoma.rst |    3 -
 ...3-10-31-22-13-05.gh-issue-59703.SML6Ag.rst |    4 -
 README.rst                                    |    2 +-
 156 files changed, 1651 insertions(+), 403 deletions(-)
 create mode 100644 Misc/NEWS.d/3.13.0a2.rst
 delete mode 100644 Misc/NEWS.d/next/Build/2023-10-17-01-56-11.gh-issue-85283.V156T2.rst
 delete mode 100644 Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst
 delete mode 100644 Misc/NEWS.d/next/Build/2023-10-20-15-29-31.gh-issue-111046.2DxQl8.rst
 delete mode 100644 Misc/NEWS.d/next/Build/2023-11-15-13-40-29.gh-issue-112088.UJQxxh.rst
 delete mode 100644 Misc/NEWS.d/next/Build/2023-11-15-16-56-20.gh-issue-96954.6FYvKn.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-06-08-21-12-44.gh-issue-67565.UkK3x-.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-07-12-12-14-52.gh-issue-106672.fkRjmi.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-08-28-17-34-10.gh-issue-85283.f1zXcc.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-08-28-17-40-51.gh-issue-85283.raFNiD.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-10-02-23-08-53.gh-issue-109587.UqqnDY.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-10-13-14-18-06.gh-issue-110815.tEFLVl.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-10-17-10-21-59.gh-issue-110964.OxqEjd.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-10-19-22-39-24.gh-issue-108082.uJytvc.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-10-30-18-13-01.gh-issue-111506.EUdO22.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-10-31-14-58-17.gh-issue-111569._V8iu4.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-10-31-18-22-03.gh-issue-108765._beYv8.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-11-08-18-37-19.gh-issue-111138.3Ypq8h.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-11-08-20-28-03.gh-issue-111863.RPeFAX.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-11-10-10-21-38.gh-issue-111262.2utB5m.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-11-10-10-24-28.gh-issue-111956.ImE6Cx.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-11-13-17-57-11.gh-issue-112026.WJLJcI.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-11-15-16-07-57.gh-issue-112026.bnr8dd.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-11-15-17-10-09.gh-issue-112026.ts9yyn.rst
 delete mode 100644 Misc/NEWS.d/next/C API/2023-11-15-18-36-21.gh-issue-112026._Yybr5.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2021-11-10-10-40-05.bpo-45759.WJoB3D.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2022-12-27-02-51-45.gh-issue-100445.C8f6ph.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-07-20-11-41-16.gh-issue-106905.AyZpuB.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-08-31-11-42-16.gh-issue-106718._-57DA.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-09-06-12-36-11.bpo-46657.xea1T_.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-09-15-23-39-43.gh-issue-103615.WZavly.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-09-30-17-30-11.gh-issue-89519.hz2pZf.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-09-19-54-33.gh-issue-110543.1wrxO8.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-12-12-09-01.gh-issue-110481.3Er3it.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-12-17-15-23.gh-issue-110722.sjMwQe.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-13-09-21-29.gh-issue-110805.vhU7A7.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-13-16-55-55.gh-issue-109094.ziL4cJ.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-14-12-19-34.gh-issue-110864.-baPDE.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-15-20-45-35.gh-issue-110892.oA6eVY.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-15-22-18-45.gh-issue-109894.UAmo06.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-16-12-12-48.gh-issue-110912.uEJGi_.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-16-15-51-37.gh-issue-109214.-RGTFH.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-17-11-03-45.gh-issue-110938.X3sbMb.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-20-23-14-06.gh-issue-111123.jjVc3M.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-23-15-44-47.gh-issue-67224.S4D6CR.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-23-22-11-09.gh-issue-94438.y2pITu.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-26-18-45-20.gh-issue-111354.GrT-Wf.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-27-11-22-09.gh-issue-111374.e9lrPZ.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-27-11-51-40.gh-issue-111380.vgSbir.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-27-12-17-49.gh-issue-111366._TSknV.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-27-19-38-33.gh-issue-102388.vd5YUZ.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-29-11-35-21.gh-issue-111435.ageUWQ.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-29-12-33-33.gh-issue-111438.bHTLLl.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-29-20-11-21.gh-issue-111420.IUT-GK.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-31-14-25-21.gh-issue-109181.11h6Mc.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-10-31-21-33-35.gh-issue-111520.vw-rxJ.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-02-14-49-19.gh-issue-111354.gIS3f-.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-02-15-00-57.gh-issue-111623.BZxYc8.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-03-01-04-55.gh-issue-111654.scUhDO.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-03-01-23-48.gh-issue-111666.l8Q8G5.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-03-19-25-38.gh-issue-111772.aRQvOn.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-03-22-48-29.gh-issue-109369.ELYaxJ.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-04-13-36-51.gh-issue-110829.Pa0CJI.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-05-06-40-35.gh-issue-111843.c045cB.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-05-20-59-10.gh-issue-81925.wKHLSS.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-06-16-44-09.gh-issue-79932.2qv7uD.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-07-12-59-02.gh-issue-81137.qFpJCY.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-14-22-12-11.gh-issue-111916.ZGCayL.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-15-16-14-10.gh-issue-106529.Y48ax9.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-15-20-20-51.gh-issue-111798.cs-3t3.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-17-16-49-32.gh-issue-111807.QvjP9_.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-19-15-57-23.gh-issue-112266.BSJMbR.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-20-10-40-40.gh-issue-112287.15gWAK.rst
 delete mode 100644 Misc/NEWS.d/next/Core and Builtins/2023-11-20-14-13-02.gh-issue-112243.FKdQnr.rst
 delete mode 100644 Misc/NEWS.d/next/IDLE/2019-01-07-06-18-25.bpo-35668.JimxP5.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2022-05-06-15-49-57.gh-issue-86826.rf006W.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2022-05-28-20-55-07.gh-issue-73561.YRmAvy.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2022-10-05-15-01-36.gh-issue-96954.ezwkrU.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2022-10-14-21-11-10.gh-issue-97928.Pdxh1G.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-03-22-02-01-30.gh-issue-102895.HiEqaZ.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-04-15-14-45-21.gh-issue-102956.Z6qeUy.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-04-26-16-37-00.gh-issue-90890.fIag4w.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-05-30-02-01-14.gh-issue-90026.FyCXw8.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-07-13-00-24-52.gh-issue-72904.Yn5-j0.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-07-29-19-00-39.gh-issue-107431.1GzJ2p.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-08-30-19-10-35.gh-issue-105931.Lpwve8.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-09-02-16-07-23.gh-issue-108791.fBcAqh.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-09-08-12-10-10.gh-issue-85098.DfQbeJ.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-09-15-12-30-21.gh-issue-109466.6ah-aw.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-09-25-20-05-41.gh-issue-109747._cRJH8.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-02-05-23-27.gh-issue-110196.djwt0z.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-08-14-17-06.gh-issue-110395._tdCsV.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-08-18-38-09.gh-issue-88434.2Q_IkG.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-09-23-59-04.gh-issue-59013.qPbS-G.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-10-17-56-41.gh-issue-110392.6g6CnP.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-12-15-16-44.gh-issue-110774.AdCb5A.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-13-06-47-20.gh-issue-110771.opwdlc.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-14-20-15-53.gh-issue-80675._M-cQC.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-14-21-33-57.gh-issue-84583.-Cmn4_.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-15-08-08-26.gh-issue-110745.mxEkh0.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-16-18-41-51.gh-issue-110944.CmUKXo.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-19-22-46-34.gh-issue-111092.hgut12.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-20-15-29-10.gh-issue-110910.u2oPwX.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-21-13-57-06.gh-issue-111159.GoHp7s.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-22-21-28-05.gh-issue-111187._W11Ab.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-23-13-53-58.gh-issue-111174.Oohmzd.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-23-22-40-47.gh-issue-111230.k3Jm84.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-23-23-14-54.gh-issue-111233.sCdCC0.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-24-12-09-46.gh-issue-111251.urFYtn.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-24-12-20-46.gh-issue-111253.HFywSK.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-25-08-42-05.gh-issue-111295.H2K4lf.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-25-11-13-35.gh-issue-111259.z7ndeA.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-25-11-54-00.gh-issue-79033.5ePgFl.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-27-09-56-20.gh-issue-111388.SlmDbC.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-27-12-46-56.gh-issue-68166.0EbWW4.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-28-04-21-17.gh-issue-111342.m8Ln1k.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-28-22-11-11.gh-issue-111429.mJGxuQ.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-29-03-46-27.gh-issue-66425.FWTdDo.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-30-08-50-46.gh-issue-111356.Bc8LvA.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-30-14-47-23.gh-issue-111246.QJ_ehs.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-10-31-07-46-56.gh-issue-111531.6zUV_G.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-01-14-03-24.gh-issue-110894.7-wZxC.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-02-12-15-46.gh-issue-111482.FWqZIU.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-04-01-20-23.gh-issue-111719.fUiKBD.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-04-10-24-25.gh-issue-111541.x0RBI1.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-04-21-12-27.gh-issue-80731.Wq51xg.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-08-07-42-53.gh-issue-111768.g-WpnV.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-08-11-50-49.gh-issue-111841.iSqdQf.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-08-15-58-57.gh-issue-111804.uAXTOL.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-08-23-32-03.gh-issue-111835.ufFiuW.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-09-10-45-56.gh-issue-103791.sdfkja.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-09-12-57-43.gh-issue-111460.TQaz9I.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-10-22-08-28.gh-issue-111942.MDFm6v.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-11-16-42-48.gh-issue-109538.cMG5ux.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-14-16-31-59.gh-issue-111995.OoX8JJ.rst
 delete mode 100644 Misc/NEWS.d/next/Library/2023-11-14-18-43-55.gh-issue-111942.x1pnrj.rst
 delete mode 100644 Misc/NEWS.d/next/Tests/2023-09-15-15-00-14.gh-issue-108747.ql0owS.rst
 delete mode 100644 Misc/NEWS.d/next/Tests/2023-10-16-13-47-24.gh-issue-110918.aFgZK3.rst
 delete mode 100644 Misc/NEWS.d/next/Tests/2023-10-17-17-54-36.gh-issue-110995.Fx8KRD.rst
 delete mode 100644 Misc/NEWS.d/next/Tests/2023-10-21-00-10-36.gh-issue-110932.jktjJU.rst
 delete mode 100644 Misc/NEWS.d/next/Tests/2023-10-21-19-27-36.gh-issue-111165.FU6mUk.rst
 delete mode 100644 Misc/NEWS.d/next/Tests/2023-10-31-22-09-25.gh-issue-110367.UhQi44.rst
 delete mode 100644 Misc/NEWS.d/next/Tests/2023-11-03-18-59-13.gh-issue-110722.jvT1pb.rst
 delete mode 100644 Misc/NEWS.d/next/Tests/2023-11-17-15-20-41.gh-issue-111808.jtIayt.rst
 delete mode 100644 Misc/NEWS.d/next/Tools-Demos/2023-11-09-13-04-29.gh-issue-111903.7Prryr.rst
 delete mode 100644 Misc/NEWS.d/next/Windows/2023-10-19-21-46-18.gh-issue-110913.CWlPfg.rst
 delete mode 100644 Misc/NEWS.d/next/Windows/2023-10-25-05-01-28.gh-issue-111293.FSsLT6.rst
 delete mode 100644 Misc/NEWS.d/next/Windows/2023-11-13-22-35-27.gh-issue-111856.vEtA5z.rst
 delete mode 100644 Misc/NEWS.d/next/macOS/2023-08-30-16-33-57.gh-issue-92603.ATkKVO.rst
 delete mode 100644 Misc/NEWS.d/next/macOS/2023-09-02-08-49-57.gh-issue-71383.Ttkchg.rst
 delete mode 100644 Misc/NEWS.d/next/macOS/2023-10-18-01-40-36.gh-issue-111015.NaLI2L.rst
 delete mode 100644 Misc/NEWS.d/next/macOS/2023-10-18-17-26-36.gh-issue-110950.sonoma.rst
 delete mode 100644 Misc/NEWS.d/next/macOS/2023-10-31-22-13-05.gh-issue-59703.SML6Ag.rst

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index c2ffa3d5a75c06..592491eed5ff84 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -20,10 +20,10 @@
 #define PY_MINOR_VERSION        13
 #define PY_MICRO_VERSION        0
 #define PY_RELEASE_LEVEL        PY_RELEASE_LEVEL_ALPHA
-#define PY_RELEASE_SERIAL       1
+#define PY_RELEASE_SERIAL       2
 
 /* Version as a string */
-#define PY_VERSION              "3.13.0a1+"
+#define PY_VERSION              "3.13.0a2"
 /*--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 87b0a2d669e5a3..7c1bdc4dff2ec4 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 Oct 13 10:51:21 2023
+# Autogenerated by Sphinx on Wed Nov 22 11:44:32 2023
 # as part of the release process.
 topics = {'assert': 'The "assert" statement\n'
            '**********************\n'
@@ -5574,7 +5574,7 @@
              '   Create an alias called *name* that executes *command*.  The\n'
              '   *command* must *not* be enclosed in quotes.  Replaceable '
              'parameters\n'
-             '   can be indicated by "%1", "%2", and so on, while "%*" is '
+             '   can be indicated by "%1", "%2", … and "%9", while "%*" is '
              'replaced\n'
              '   by all the parameters. If *command* is omitted, the current '
              'alias\n'
@@ -14650,10 +14650,16 @@
           '   objects (for example when catching an exception and storing its\n'
           '   traceback for later use).\n'
           '\n'
-          '   "RuntimeError" is raised if the frame is currently executing.\n'
+          '   "RuntimeError" is raised if the frame is currently executing or\n'
+          '   suspended.\n'
           '\n'
           '   New in version 3.4.\n'
           '\n'
+          '   Changed in version 3.13: Attempting to clear a suspended frame\n'
+          '   raises "RuntimeError" (as has always been the case for '
+          'executing\n'
+          '   frames).\n'
+          '\n'
           '\n'
           'Traceback objects\n'
           '-----------------\n'
@@ -15216,21 +15222,23 @@
                  '\n'
                  'Keys views are set-like since their entries are unique and '
                  '*hashable*.\n'
-                 'If all values are hashable, so that "(key, value)" pairs are '
-                 'unique\n'
-                 'and hashable, then the items view is also set-like.  (Values '
-                 'views are\n'
-                 'not treated as set-like since the entries are generally not '
-                 'unique.)\n'
-                 'For set-like views, all of the operations defined for the '
-                 'abstract\n'
-                 'base class "collections.abc.Set" are available (for example, '
-                 '"==",\n'
-                 '"<", or "^").  While using set operators, set-like views '
-                 'accept any\n'
-                 'iterable as the other operand, unlike sets which only accept '
-                 'sets as\n'
-                 'the input.\n'
+                 'Items views also have set-like operations since the (key, '
+                 'value) pairs\n'
+                 'are unique and the keys are hashable. If all values in an '
+                 'items view\n'
+                 'are hashable as well, then the items view can interoperate '
+                 'with other\n'
+                 'sets. (Values views are not treated as set-like since the '
+                 'entries are\n'
+                 'generally not unique.)  For set-like views, all of the '
+                 'operations\n'
+                 'defined for the abstract base class "collections.abc.Set" '
+                 'are\n'
+                 'available (for example, "==", "<", or "^").  While using '
+                 'set\n'
+                 'operators, set-like views accept any iterable as the other '
+                 'operand,\n'
+                 'unlike sets which only accept sets as the input.\n'
                  '\n'
                  'An example of dictionary view usage:\n'
                  '\n'
diff --git a/Misc/NEWS.d/3.13.0a2.rst b/Misc/NEWS.d/3.13.0a2.rst
new file mode 100644
index 00000000000000..c1b1be523325e8
--- /dev/null
+++ b/Misc/NEWS.d/3.13.0a2.rst
@@ -0,0 +1,1622 @@
+.. date: 2023-11-20-14-13-02
+.. gh-issue: 112243
+.. nonce: FKdQnr
+.. release date: 2023-11-22
+.. section: Core and Builtins
+
+Don't include comments in f-string debug expressions. Patch by Pablo Galindo
+
+..
+
+.. date: 2023-11-20-10-40-40
+.. gh-issue: 112287
+.. nonce: 15gWAK
+.. section: Core and Builtins
+
+Slightly optimize the Tier 2 (uop) interpreter by only loading ``oparg`` and
+``operand`` when needed. Also double the trace size limit again, to 512 this
+time.
+
+..
+
+.. date: 2023-11-19-15-57-23
+.. gh-issue: 112266
+.. nonce: BSJMbR
+.. section: Core and Builtins
+
+Change docstrings of :attr:`~object.__dict__` and
+:attr:`~object.__weakref__`.
+
+..
+
+.. date: 2023-11-17-16-49-32
+.. gh-issue: 111807
+.. nonce: QvjP9_
+.. section: Core and Builtins
+
+Lower the max parser stack depth to 1000 under WASI debug builds.
+
+..
+
+.. date: 2023-11-15-20-20-51
+.. gh-issue: 111798
+.. nonce: cs-3t3
+.. section: Core and Builtins
+
+When Python is built in debug mode, set the C recursion limit to 500 instead
+of 1500. A debug build is likely built with low optimization level which
+implies higher stack memory usage than a release build. Patch by Victor
+Stinner.
+
+..
+
+.. date: 2023-11-15-16-14-10
+.. gh-issue: 106529
+.. nonce: Y48ax9
+.. section: Core and Builtins
+
+Enable translating unspecialized ``FOR_ITER`` to Tier 2.
+
+..
+
+.. date: 2023-11-14-22-12-11
+.. gh-issue: 111916
+.. nonce: ZGCayL
+.. section: Core and Builtins
+
+Make hashlib related modules thread-safe without the GIL
+
+..
+
+.. date: 2023-11-07-12-59-02
+.. gh-issue: 81137
+.. nonce: qFpJCY
+.. section: Core and Builtins
+
+Deprecate assignment to a function's ``__code__`` field when the new code
+object is of a mismatched type (e.g., from a generator to a plain function).
+
+..
+
+.. date: 2023-11-06-16-44-09
+.. gh-issue: 79932
+.. nonce: 2qv7uD
+.. section: Core and Builtins
+
+Raise exception if :meth:`frame.clear` is called on a suspended frame.
+
+..
+
+.. date: 2023-11-05-20-59-10
+.. gh-issue: 81925
+.. nonce: wKHLSS
+.. section: Core and Builtins
+
+Implement native thread ids for GNU KFreeBSD.
+
+..
+
+.. date: 2023-11-05-06-40-35
+.. gh-issue: 111843
+.. nonce: c045cB
+.. section: Core and Builtins
+
+Use exponential backoff to reduce the number of failed tier 2 optimization
+attempts by over 99%.
+
+..
+
+.. date: 2023-11-04-13-36-51
+.. gh-issue: 110829
+.. nonce: Pa0CJI
+.. section: Core and Builtins
+
+Joining a thread now ensures the underlying OS thread has exited. This is
+required for safer fork() in multi-threaded processes.
+
+..
+
+.. date: 2023-11-03-22-48-29
+.. gh-issue: 109369
+.. nonce: ELYaxJ
+.. section: Core and Builtins
+
+Make sure that tier 2 traces are de-optimized if the code is instrumented
+
+..
+
+.. date: 2023-11-03-19-25-38
+.. gh-issue: 111772
+.. nonce: aRQvOn
+.. section: Core and Builtins
+
+Specialize slot loads and stores for _Py_T_OBJECT as well as Py_T_OBJECT_EX
+
+..
+
+.. date: 2023-11-03-01-23-48
+.. gh-issue: 111666
+.. nonce: l8Q8G5
+.. section: Core and Builtins
+
+Speed up :meth:`BaseExceptionGroup.derive`,
+:meth:`BaseExceptionGroup.subgroup`, and :meth:`BaseExceptionGroup.split` by
+changing how they parse passed arguments.
+
+..
+
+.. date: 2023-11-03-01-04-55
+.. gh-issue: 111654
+.. nonce: scUhDO
+.. section: Core and Builtins
+
+Fix runtime crash when some error happens in opcode
+``LOAD_FROM_DICT_OR_DEREF``.
+
+..
+
+.. date: 2023-11-02-15-00-57
+.. gh-issue: 111623
+.. nonce: BZxYc8
+.. section: Core and Builtins
+
+Add support for sharing tuples between interpreters using the
+cross-interpreter API.  Patch by Anthony Shaw.
+
+..
+
+.. date: 2023-11-02-14-49-19
+.. gh-issue: 111354
+.. nonce: gIS3f-
+.. section: Core and Builtins
+
+The oparg of :opcode:`YIELD_VALUE` is now ``1`` if the instruction is part
+of a yield-from or await, and ``0`` otherwise.
+
+The SUSPENDED frame state is now split into ``SUSPENDED`` and
+``SUSPENDED_YIELD_FROM``. This simplifies the code in ``_PyGen_yf``.
+
+..
+
+.. date: 2023-10-31-21-33-35
+.. gh-issue: 111520
+.. nonce: vw-rxJ
+.. section: Core and Builtins
+
+Merge the Tier 1 (bytecode) and Tier 2 (micro-ops) interpreters together,
+moving the Tier 2 interpreter loop and switch into
+``_PyEval_EvalFrameDefault()`` in ``Python/ceval.c``. The
+``Python/executor.c`` file is gone. Also the ``TIER_ONE`` and ``TIER_TWO``
+macros are now handled by the code generator.
+
+**Beware!** This changes the environment variables to enable micro-ops and
+their debugging to ``PYTHON_UOPS`` and ``PYTHON_LLTRACE``.
+
+..
+
+.. date: 2023-10-31-14-25-21
+.. gh-issue: 109181
+.. nonce: 11h6Mc
+.. section: Core and Builtins
+
+Speed up :obj:`Traceback` object creation by lazily compute the line number.
+Patch by Pablo Galindo
+
+..
+
+.. date: 2023-10-29-20-11-21
+.. gh-issue: 111420
+.. nonce: IUT-GK
+.. section: Core and Builtins
+
+Allow type comments in parenthesized ``with`` statements
+
+..
+
+.. date: 2023-10-29-12-33-33
+.. gh-issue: 111438
+.. nonce: bHTLLl
+.. section: Core and Builtins
+
+Add support for sharing floats between interpreters using the
+cross-interpreter API.  Patch by Anthony Shaw.
+
+..
+
+.. date: 2023-10-29-11-35-21
+.. gh-issue: 111435
+.. nonce: ageUWQ
+.. section: Core and Builtins
+
+Add support for sharing of True and False between interpreters using the
+cross-interpreter API.  Patch by Anthony Shaw.
+
+..
+
+.. date: 2023-10-27-19-38-33
+.. gh-issue: 102388
+.. nonce: vd5YUZ
+.. section: Core and Builtins
+
+Fix a bug where ``iso2022_jp_3`` and ``iso2022_jp_2004`` codecs read out of
+bounds
+
+..
+
+.. date: 2023-10-27-12-17-49
+.. gh-issue: 111366
+.. nonce: _TSknV
+.. section: Core and Builtins
+
+Fix an issue in the :mod:`codeop` that was causing :exc:`SyntaxError`
+exceptions raised in the presence of invalid syntax to not contain precise
+error messages. Patch by Pablo Galindo
+
+..
+
+.. date: 2023-10-27-11-51-40
+.. gh-issue: 111380
+.. nonce: vgSbir
+.. section: Core and Builtins
+
+Fix a bug that was causing :exc:`SyntaxWarning` to appear twice when parsing
+if invalid syntax is encountered later. Patch by Pablo galindo
+
+..
+
+.. date: 2023-10-27-11-22-09
+.. gh-issue: 111374
+.. nonce: e9lrPZ
+.. section: Core and Builtins
+
+Added a new environment variable :envvar:`PYTHON_FROZEN_MODULES`. It
+determines whether or not frozen modules are ignored by the import
+machinery, equivalent of the :option:`-X frozen_modules <-X>` command-line
+option.
+
+..
+
+.. date: 2023-10-26-18-45-20
+.. gh-issue: 111354
+.. nonce: GrT-Wf
+.. section: Core and Builtins
+
+Remove ``oparg`` from :opcode:`YIELD_VALUE`. Change ``oparg`` of
+:opcode:`RESUME` to include information about the except-depth. These
+changes make it possible to simplify the code in generator close.
+
+..
+
+.. date: 2023-10-23-22-11-09
+.. gh-issue: 94438
+.. nonce: y2pITu
+.. section: Core and Builtins
+
+Fix a regression that prevented jumping across ``is None`` and ``is not
+None`` when debugging. Patch by Savannah Ostrowski.
+
+..
+
+.. date: 2023-10-23-15-44-47
+.. gh-issue: 67224
+.. nonce: S4D6CR
+.. section: Core and Builtins
+
+Show source lines in tracebacks when using the ``-c`` option when running
+Python. Patch by Pablo Galindo
+
+..
+
+.. date: 2023-10-20-23-14-06
+.. gh-issue: 111123
+.. nonce: jjVc3M
+.. section: Core and Builtins
+
+Fix a bug where a :keyword:`global` declaration in an :keyword:`except`
+block is rejected when the global is used in the :keyword:`else` block.
+
+..
+
+.. date: 2023-10-17-11-03-45
+.. gh-issue: 110938
+.. nonce: X3sbMb
+.. section: Core and Builtins
+
+Fix error messages for indented blocks with functions and classes with
+generic type parameters. Patch by Pablo Galindo
+
+..
+
+.. date: 2023-10-16-15-51-37
+.. gh-issue: 109214
+.. nonce: -RGTFH
+.. section: Core and Builtins
+
+Remove unnecessary instruction pointer updates before returning from frames.
+
+..
+
+.. date: 2023-10-16-12-12-48
+.. gh-issue: 110912
+.. nonce: uEJGi_
+.. section: Core and Builtins
+
+Correctly display the traceback for :exc:`MemoryError` exceptions using the
+:mod:`traceback` module. Patch by Pablo Galindo
+
+..
+
+.. date: 2023-10-15-22-18-45
+.. gh-issue: 109894
+.. nonce: UAmo06
+.. section: Core and Builtins
+
+Fixed crash due to improperly initialized static :exc:`MemoryError` in
+subinterpreter.
+
+..
+
+.. date: 2023-10-15-20-45-35
+.. gh-issue: 110892
+.. nonce: oA6eVY
+.. section: Core and Builtins
+
+Return ``NULL`` for ``PyTrace_RETURN`` events caused by an exception
+
+..
+
+.. date: 2023-10-14-12-19-34
+.. gh-issue: 110864
+.. nonce: -baPDE
+.. section: Core and Builtins
+
+Fix argument parsing by ``_PyArg_UnpackKeywordsWithVararg`` for functions
+defining pos-or-keyword, vararg, and kw-only parameters.
+
+..
+
+.. date: 2023-10-13-16-55-55
+.. gh-issue: 109094
+.. nonce: ziL4cJ
+.. section: Core and Builtins
+
+Replace ``prev_instr`` on the interpreter frame by ``instr_ptr`` which
+points to the beginning of the instruction that is currently executing (or
+will execute once the frame resumes).
+
+..
+
+.. date: 2023-10-13-09-21-29
+.. gh-issue: 110805
+.. nonce: vhU7A7
+.. section: Core and Builtins
+
+Allow the repl to show source code and complete tracebacks. Patch by Pablo
+Galindo
+
+..
+
+.. date: 2023-10-12-17-15-23
+.. gh-issue: 110722
+.. nonce: sjMwQe
+.. section: Core and Builtins
+
+Add :envvar:`PYTHON_PRESITE=package.module` to import a module early in the
+interpreter lifecycle before ``site.py`` is executed.  Python needs to be
+:ref:`built in debug mode <debug-build>` for this option to exist.
+
+..
+
+.. date: 2023-10-12-12-09-01
+.. gh-issue: 110481
+.. nonce: 3Er3it
+.. section: Core and Builtins
+
+Implement biased reference counting in ``--disable-gil`` builds.
+
+..
+
+.. date: 2023-10-09-19-54-33
+.. gh-issue: 110543
+.. nonce: 1wrxO8
+.. section: Core and Builtins
+
+Fix regression in Python 3.12 where :meth:`types.CodeType.replace` would
+produce a broken code object if called on a module or class code object that
+contains a comprehension. Patch by Jelle Zijlstra.
+
+..
+
+.. date: 2023-09-30-17-30-11
+.. gh-issue: 89519
+.. nonce: hz2pZf
+.. section: Core and Builtins
+
+Removed chained :class:`classmethod` descriptors (introduced in
+:issue:`19072`).  This can no longer be used to wrap other descriptors such
+as :class:`property`.  The core design of this feature was flawed and caused
+a number of downstream problems.  To "pass-through" a :class:`classmethod`,
+consider using the :attr:`!__wrapped__` attribute that was added in Python
+3.10.
+
+..
+
+.. date: 2023-09-15-23-39-43
+.. gh-issue: 103615
+.. nonce: WZavly
+.. section: Core and Builtins
+
+Use local events for opcode tracing
+
+..
+
+.. bpo: 46657
+.. date: 2023-09-06-12-36-11
+.. nonce: xea1T_
+.. section: Core and Builtins
+
+Add mimalloc memory allocator support.
+
+..
+
+.. date: 2023-08-31-11-42-16
+.. gh-issue: 106718
+.. nonce: _-57DA
+.. section: Core and Builtins
+
+When PyConfig.stdlib_dir is explicitly set, it's now respected and won't be
+overridden by PyConfig.home.
+
+..
+
+.. date: 2023-07-20-11-41-16
+.. gh-issue: 106905
+.. nonce: AyZpuB
+.. section: Core and Builtins
+
+Fix incorrect SystemError about AST constructor recursion depth mismatch.
+
+..
+
+.. date: 2022-12-27-02-51-45
+.. gh-issue: 100445
+.. nonce: C8f6ph
+.. section: Core and Builtins
+
+Improve error message for unterminated strings with escapes.
+
+..
+
+.. bpo: 45759
+.. date: 2021-11-10-10-40-05
+.. nonce: WJoB3D
+.. section: Core and Builtins
+
+Improved error messages for ``elif``/``else`` statements not matching any
+valid statements. Patch by Jeremiah Vivian.
+
+..
+
+.. date: 2023-11-14-18-43-55
+.. gh-issue: 111942
+.. nonce: x1pnrj
+.. section: Library
+
+Fix SystemError in the TextIOWrapper constructor with non-encodable "errors"
+argument in non-debug mode.
+
+..
+
+.. date: 2023-11-14-16-31-59
+.. gh-issue: 111995
+.. nonce: OoX8JJ
+.. section: Library
+
+Added the ``NI_IDN`` constant to the :mod:`socket` module when present in C
+at build time for use with :func:`socket.getnameinfo`.
+
+..
+
+.. date: 2023-11-11-16-42-48
+.. gh-issue: 109538
+.. nonce: cMG5ux
+.. section: Library
+
+Issue warning message instead of having :class:`RuntimeError` be displayed
+when event loop has already been closed at :meth:`StreamWriter.__del__`.
+
+..
+
+.. date: 2023-11-10-22-08-28
+.. gh-issue: 111942
+.. nonce: MDFm6v
+.. section: Library
+
+Fix crashes in :meth:`io.TextIOWrapper.reconfigure` when pass invalid
+arguments, e.g. non-string encoding.
+
+..
+
+.. date: 2023-11-09-12-57-43
+.. gh-issue: 111460
+.. nonce: TQaz9I
+.. section: Library
+
+:mod:`curses`: restore wide character support (including
+:func:`curses.unget_wch` and :meth:`~curses.window.get_wch`) on macOS, which
+was unavailable due to a regression in Python 3.12.
+
+..
+
+.. date: 2023-11-09-10-45-56
+.. gh-issue: 103791
+.. nonce: sdfkja
+.. section: Library
+
+:class:`contextlib.suppress` now supports suppressing exceptions raised as
+part of a :exc:`BaseExceptionGroup`, in addition to the recent support for
+:exc:`ExceptionGroup`.
+
+..
+
+.. date: 2023-11-08-23-32-03
+.. gh-issue: 111835
+.. nonce: ufFiuW
+.. section: Library
+
+The :class:`mmap.mmap` class now has an :meth:`~mmap.mmap.seekable` method
+that can be used where it requires a file-like object with seekable and the
+:meth:`~mmap.mmap.seek` method return the new absolute position. Patch by
+Donghee Na.
+
+..
+
+.. date: 2023-11-08-15-58-57
+.. gh-issue: 111804
+.. nonce: uAXTOL
+.. section: Library
+
+Remove posix.fallocate() under WASI as the underlying posix_fallocate() is
+not available in WASI preview2.
+
+..
+
+.. date: 2023-11-08-11-50-49
+.. gh-issue: 111841
+.. nonce: iSqdQf
+.. section: Library
+
+Fix truncating arguments on an embedded null character in :meth:`os.putenv`
+and :meth:`os.unsetenv` on Windows.
+
+..
+
+.. date: 2023-11-08-07-42-53
+.. gh-issue: 111768
+.. nonce: g-WpnV
+.. section: Library
+
+:func:`wsgiref.util.is_hop_by_hop` is now exposed correctly in ``__all__``.
+
+..
+
+.. date: 2023-11-04-21-12-27
+.. gh-issue: 80731
+.. nonce: Wq51xg
+.. section: Library
+
+Avoid executing the default function in :class:`cmd.Cmd` in an except block
+
+..
+
+.. date: 2023-11-04-10-24-25
+.. gh-issue: 111541
+.. nonce: x0RBI1
+.. section: Library
+
+Fix :mod:`doctest` for :exc:`SyntaxError` not-builtin subclasses.
+
+..
+
+.. date: 2023-11-04-01-20-23
+.. gh-issue: 111719
+.. nonce: fUiKBD
+.. section: Library
+
+Add extra argument validation for ``alias`` command in :mod:`pdb`
+
+..
+
+.. date: 2023-11-02-12-15-46
+.. gh-issue: 111482
+.. nonce: FWqZIU
+.. section: Library
+
+:mod:`time`: Make :func:`time.clock_gettime()` and
+:func:`time.clock_gettime_ns()` functions up to 2x faster by faster calling
+convention. Patch by Victor Stinner.
+
+..
+
+.. date: 2023-11-01-14-03-24
+.. gh-issue: 110894
+.. nonce: 7-wZxC
+.. section: Library
+
+Call loop exception handler for exceptions in ``client_connected_cb`` of
+:func:`asyncio.start_server` so that applications can handle it. Patch by
+Kumar Aditya.
+
+..
+
+.. date: 2023-10-31-07-46-56
+.. gh-issue: 111531
+.. nonce: 6zUV_G
+.. section: Library
+
+Fix reference leaks in ``bind_class()`` and ``bind_all()`` methods of
+:mod:`tkinter` widgets.
+
+..
+
+.. date: 2023-10-30-14-47-23
+.. gh-issue: 111246
+.. nonce: QJ_ehs
+.. section: Library
+
+:meth:`asyncio.loop.create_unix_server` will now automatically remove the
+Unix socket when the server is closed.
+
+..
+
+.. date: 2023-10-30-08-50-46
+.. gh-issue: 111356
+.. nonce: Bc8LvA
+.. section: Library
+
+Added :func:`io.text_encoding()`, :data:`io.DEFAULT_BUFFER_SIZE`, and
+:class:`io.IncrementalNewlineDecoder` to ``io.__all__``.
+
+..
+
+.. date: 2023-10-29-03-46-27
+.. gh-issue: 66425
+.. nonce: FWTdDo
+.. section: Library
+
+Remove the code to set the REMOTE_HOST header from wsgiref module, as it is
+unreachable. This header is used for performance reasons, which is not
+necessary in the wsgiref module.
+
+..
+
+.. date: 2023-10-28-22-11-11
+.. gh-issue: 111429
+.. nonce: mJGxuQ
+.. section: Library
+
+Speed up :meth:`pathlib.PurePath.relative_to` and
+:meth:`~pathlib.PurePath.is_relative_to`.
+
+..
+
+.. date: 2023-10-28-04-21-17
+.. gh-issue: 111342
+.. nonce: m8Ln1k
+.. section: Library
+
+Fixed typo in :func:`math.sumprod`.
+
+..
+
+.. date: 2023-10-27-12-46-56
+.. gh-issue: 68166
+.. nonce: 0EbWW4
+.. section: Library
+
+Remove mention of not supported "vsapi" element type in
+:meth:`tkinter.ttk.Style.element_create`. Add tests for ``element_create()``
+and other ``ttk.Style`` methods. Add examples for ``element_create()`` in
+the documentation.
+
+..
+
+.. date: 2023-10-27-09-56-20
+.. gh-issue: 111388
+.. nonce: SlmDbC
+.. section: Library
+
+Add ``show_group`` parameter to :func:`traceback.format_exception_only`,
+which allows to format :exc:`ExceptionGroup` instances.
+
+..
+
+.. date: 2023-10-25-11-54-00
+.. gh-issue: 79033
+.. nonce: 5ePgFl
+.. section: Library
+
+Another attempt at fixing :func:`asyncio.Server.wait_closed()`. It now
+blocks until both conditions are true: the server is closed, *and* there are
+no more active connections. (This means that in some cases where in 3.12.0
+this function would *incorrectly* have returned immediately, it will now
+block; in particular, when there are no active connections but the server
+hasn't been closed yet.)
+
+..
+
+.. date: 2023-10-25-11-13-35
+.. gh-issue: 111259
+.. nonce: z7ndeA
+.. section: Library
+
+Optimize recursive wildcards in :mod:`pathlib`.
+
+..
+
+.. date: 2023-10-25-08-42-05
+.. gh-issue: 111295
+.. nonce: H2K4lf
+.. section: Library
+
+Fix :mod:`time` not checking for errors when initializing.
+
+..
+
+.. date: 2023-10-24-12-20-46
+.. gh-issue: 111253
+.. nonce: HFywSK
+.. section: Library
+
+Add error checking during :mod:`!_socket` module init.
+
+..
+
+.. date: 2023-10-24-12-09-46
+.. gh-issue: 111251
+.. nonce: urFYtn
+.. section: Library
+
+Fix :mod:`_blake2` not checking for errors when initializing.
+
+..
+
+.. date: 2023-10-23-23-14-54
+.. gh-issue: 111233
+.. nonce: sCdCC0
+.. section: Library
+
+Fix :mod:`select` not checking for errors when initializing.
+
+..
+
+.. date: 2023-10-23-22-40-47
+.. gh-issue: 111230
+.. nonce: k3Jm84
+.. section: Library
+
+Fix :mod:`ssl` not checking for errors when initializing.
+
+..
+
+.. date: 2023-10-23-13-53-58
+.. gh-issue: 111174
+.. nonce: Oohmzd
+.. section: Library
+
+Fix crash in :meth:`io.BytesIO.getbuffer` called repeatedly for empty
+BytesIO.
+
+..
+
+.. date: 2023-10-22-21-28-05
+.. gh-issue: 111187
+.. nonce: _W11Ab
+.. section: Library
+
+Postpone removal version for locale.getdefaultlocale() to Python 3.15.
+
+..
+
+.. date: 2023-10-21-13-57-06
+.. gh-issue: 111159
+.. nonce: GoHp7s
+.. section: Library
+
+Fix :mod:`doctest` output comparison for exceptions with notes.
+
+..
+
+.. date: 2023-10-20-15-29-10
+.. gh-issue: 110910
+.. nonce: u2oPwX
+.. section: Library
+
+Fix invalid state handling in :class:`asyncio.TaskGroup` and
+:class:`asyncio.Timeout`. They now raise proper RuntimeError if they are
+improperly used and are left in consistent state after this.
+
+..
+
+.. date: 2023-10-19-22-46-34
+.. gh-issue: 111092
+.. nonce: hgut12
+.. section: Library
+
+Make turtledemo run without default root enabled.
+
+..
+
+.. date: 2023-10-16-18-41-51
+.. gh-issue: 110944
+.. nonce: CmUKXo
+.. section: Library
+
+Support alias and convenience vars for :mod:`pdb` completion
+
+..
+
+.. date: 2023-10-15-08-08-26
+.. gh-issue: 110745
+.. nonce: mxEkh0
+.. section: Library
+
+Added *newline* parameter to :meth:`pathlib.Path.read_text`. Patch by Junya
+Okabe.
+
+..
+
+.. date: 2023-10-14-21-33-57
+.. gh-issue: 84583
+.. nonce: -Cmn4_
+.. section: Library
+
+Make :mod:`pdb` enter post-mortem mode even for :exc:`SyntaxError`
+
+..
+
+.. date: 2023-10-14-20-15-53
+.. gh-issue: 80675
+.. nonce: _M-cQC
+.. section: Library
+
+Set ``f_trace_lines = True`` on all frames upon :func:`pdb.set_trace()`
+
+..
+
+.. date: 2023-10-13-06-47-20
+.. gh-issue: 110771
+.. nonce: opwdlc
+.. section: Library
+
+Expose the setup and cleanup portions of ``asyncio.run_forever()`` as the
+standalone methods ``asyncio.run_forever_setup()`` and
+``asyncio.run_forever_cleanup()``. This allows for tighter integration with
+GUI event loops.
+
+..
+
+.. date: 2023-10-12-15-16-44
+.. gh-issue: 110774
+.. nonce: AdCb5A
+.. section: Library
+
+Support setting the :class:`asyncio.Runner` loop_factory kwarg in
+:class:`unittest.IsolatedAsyncioTestCase`
+
+..
+
+.. date: 2023-10-10-17-56-41
+.. gh-issue: 110392
+.. nonce: 6g6CnP
+.. section: Library
+
+Fix :func:`tty.setraw` and :func:`tty.setcbreak`: previously they returned
+partially modified list of the original tty attributes.
+:func:`tty.cfmakeraw` and :func:`tty.cfmakecbreak` now make a copy of the
+list of special characters before modifying it.
+
+..
+
+.. date: 2023-10-09-23-59-04
+.. gh-issue: 59013
+.. nonce: qPbS-G
+.. section: Library
+
+Make line number of function breakpoint more precise in :mod:`pdb`
+
+..
+
+.. date: 2023-10-08-18-38-09
+.. gh-issue: 88434
+.. nonce: 2Q_IkG
+.. section: Library
+
+Emit deprecation warning for non-integer numbers in :mod:`gettext` functions
+and methods that consider plural forms even if the translation was not
+found.
+
+..
+
+.. date: 2023-10-08-14-17-06
+.. gh-issue: 110395
+.. nonce: _tdCsV
+.. section: Library
+
+Ensure that :func:`select.kqueue` objects correctly appear as closed in
+forked children, to prevent operations on an invalid file descriptor.
+
+..
+
+.. date: 2023-10-02-05-23-27
+.. gh-issue: 110196
+.. nonce: djwt0z
+.. section: Library
+
+Add ``__reduce__`` method to :class:`IPv6Address` in order to keep
+``scope_id``
+
+..
+
+.. date: 2023-09-25-20-05-41
+.. gh-issue: 109747
+.. nonce: _cRJH8
+.. section: Library
+
+Improve errors for unsupported look-behind patterns. Now re.error is raised
+instead of OverflowError or RuntimeError for too large width of look-behind
+pattern.
+
+..
+
+.. date: 2023-09-15-12-30-21
+.. gh-issue: 109466
+.. nonce: 6ah-aw
+.. section: Library
+
+Add the :attr:`ipaddress.IPv4Address.ipv6_mapped` property, which retuns the
+IPv4-mapped IPv6 address.
+
+..
+
+.. date: 2023-09-08-12-10-10
+.. gh-issue: 85098
+.. nonce: DfQbeJ
+.. section: Library
+
+Implement the CLI of the :mod:`symtable` module and improve the repr of
+:class:`~symtable.Symbol`.
+
+..
+
+.. date: 2023-09-02-16-07-23
+.. gh-issue: 108791
+.. nonce: fBcAqh
+.. section: Library
+
+Improved error handling in :mod:`pdb` command line interface, making it
+produce more concise error messages.
+
+..
+
+.. date: 2023-08-30-19-10-35
+.. gh-issue: 105931
+.. nonce: Lpwve8
+.. section: Library
+
+Change :mod:`compileall` to only strip the stripdir prefix from the full
+path recorded in the compiled ``.pyc`` file, when the prefix matches the
+start of the full path in its entirety. When the prefix does not match, no
+stripping is performed and a warning to this effect is displayed.
+
+Previously all path components of the stripdir prefix that matched the full
+path were removed, while those that did not match were left alone (including
+ones interspersed between matching components).
+
+..
+
+.. date: 2023-07-29-19-00-39
+.. gh-issue: 107431
+.. nonce: 1GzJ2p
+.. section: Library
+
+Make the ``DictProxy`` and ``ListProxy`` types in
+:mod:`multiprocessing.managers` :ref:`Generic Alias
+Types<types-genericalias>` for ``[]`` use in typing contexts.
+
+..
+
+.. date: 2023-07-13-00-24-52
+.. gh-issue: 72904
+.. nonce: Yn5-j0
+.. section: Library
+
+Add :func:`glob.translate`. This function converts a pathname with
+shell-style wildcards to a regular expression.
+
+..
+
+.. date: 2023-05-30-02-01-14
+.. gh-issue: 90026
+.. nonce: FyCXw8
+.. section: Library
+
+Define ``USE_XATTRS`` on Cygwin so that XATTR-related functions in the
+:mod:`os` module become available.
+
+..
+
+.. date: 2023-04-26-16-37-00
+.. gh-issue: 90890
+.. nonce: fIag4w
+.. section: Library
+
+New methods :meth:`mailbox.Maildir.get_info`,
+:meth:`mailbox.Maildir.set_info`, :meth:`mailbox.Maildir.get_flags`,
+:meth:`mailbox.Maildir.set_flags`, :meth:`mailbox.Maildir.add_flag`,
+:meth:`mailbox.Maildir.remove_flag`. These methods speed up accessing a
+message's info and/or flags and are useful when it is not necessary to
+access the message's contents, as when iterating over a Maildir to find
+messages with specific flags.
+
+..
+
+.. date: 2023-04-15-14-45-21
+.. gh-issue: 102956
+.. nonce: Z6qeUy
+.. section: Library
+
+Fix returning of empty byte strings after seek in zipfile module
+
+..
+
+.. date: 2023-03-22-02-01-30
+.. gh-issue: 102895
+.. nonce: HiEqaZ
+.. section: Library
+
+Added a parameter ``local_exit`` for :func:`code.interact` to prevent
+``exit()`` and ``quit`` from closing ``sys.stdin`` and raise ``SystemExit``.
+
+..
+
+.. date: 2022-10-14-21-11-10
+.. gh-issue: 97928
+.. nonce: Pdxh1G
+.. section: Library
+
+Change the behavior of :meth:`tkinter.Text.count`. It now always returns an
+integer if one or less counting options are specified. Previously it could
+return a single count as a 1-tuple, an integer (only if option ``"update"``
+was specified) or ``None`` if no items found. The result is now the same if
+``wantobjects`` is set to ``0``.
+
+..
+
+.. date: 2022-10-05-15-01-36
+.. gh-issue: 96954
+.. nonce: ezwkrU
+.. section: Library
+
+Switch the storage of the unicode codepoint names to use a different
+data-structure, a `directed acyclic word graph
+<https://en.wikipedia.org/wiki/Deterministic_acyclic_finite_state_automaton>`_.
+This makes the unicodedata shared library about 440 KiB smaller. Contributed
+by Carl Friedrich Bolz-Tereick using code from the PyPy project.
+
+..
+
+.. date: 2022-05-28-20-55-07
+.. gh-issue: 73561
+.. nonce: YRmAvy
+.. section: Library
+
+Omit the interface scope from an IPv6 address when used as Host header by
+:mod:`http.client`.
+
+..
+
+.. date: 2022-05-06-15-49-57
+.. gh-issue: 86826
+.. nonce: rf006W
+.. section: Library
+
+:mod:`zipinfo` now supports the full range of values in the TZ string
+determined by RFC 8536 and detects all invalid formats. Both Python and C
+implementations now raise exceptions of the same type on invalid data.
+
+..
+
+.. date: 2023-11-17-15-20-41
+.. gh-issue: 111808
+.. nonce: jtIayt
+.. section: Tests
+
+Make the default value of ``test.support.infinite_recursion()`` to be
+conditional based on whether optimizations were used when compiling the
+interpreter. This helps with platforms like WASI whose stack size is greatly
+restricted in debug builds.
+
+..
+
+.. date: 2023-11-03-18-59-13
+.. gh-issue: 110722
+.. nonce: jvT1pb
+.. section: Tests
+
+Gathering line coverage of standard libraries within the regression test
+suite is now precise, as well as much faster. Patch by Łukasz Langa.
+
+..
+
+.. date: 2023-10-31-22-09-25
+.. gh-issue: 110367
+.. nonce: UhQi44
+.. section: Tests
+
+Make regrtest ``--verbose3`` option compatible with ``--huntrleaks -jN``
+options. The ``./python -m test -j1 -R 3:3 --verbose3`` command now works as
+expected. Patch by Victor Stinner.
+
+..
+
+.. date: 2023-10-21-19-27-36
+.. gh-issue: 111165
+.. nonce: FU6mUk
+.. section: Tests
+
+Remove no longer used functions ``run_unittest()`` and ``run_doctest()``
+from the :mod:`test.support` module.
+
+..
+
+.. date: 2023-10-21-00-10-36
+.. gh-issue: 110932
+.. nonce: jktjJU
+.. section: Tests
+
+Fix regrtest if the ``SOURCE_DATE_EPOCH`` environment variable is defined:
+use the variable value as the random seed. Patch by Victor Stinner.
+
+..
+
+.. date: 2023-10-17-17-54-36
+.. gh-issue: 110995
+.. nonce: Fx8KRD
+.. section: Tests
+
+test_gdb: Fix detection of gdb built without Python scripting support. Patch
+by Victor Stinner.
+
+..
+
+.. date: 2023-10-16-13-47-24
+.. gh-issue: 110918
+.. nonce: aFgZK3
+.. section: Tests
+
+Test case matching patterns specified by options ``--match``, ``--ignore``,
+``--matchfile`` and ``--ignorefile`` are now tested in the order of
+specification, and the last match determines whether the test case be run or
+ignored.
+
+..
+
+.. date: 2023-09-15-15-00-14
+.. gh-issue: 108747
+.. nonce: ql0owS
+.. section: Tests
+
+Add unit test for ``usercustomize`` and ``sitecustomize`` hooks from
+:class:`site`.
+
+..
+
+.. date: 2023-11-15-16-56-20
+.. gh-issue: 96954
+.. nonce: 6FYvKn
+.. section: Build
+
+Make ``make regen-unicodedata`` work for out-of-tree builds of CPython.
+
+..
+
+.. date: 2023-11-15-13-40-29
+.. gh-issue: 112088
+.. nonce: UJQxxh
+.. section: Build
+
+Add ``Tools/build/regen-configure.sh`` script to regenerate the
+``configure`` with an Ubuntu container image. The
+``quay.io/tiran/cpython_autoconf:271`` container image
+(`tiran/cpython_autoconf <https://github.com/tiran/cpython_autoconf>`_) is
+no longer used. Patch by Victor Stinner.
+
+..
+
+.. date: 2023-10-20-15-29-31
+.. gh-issue: 111046
+.. nonce: 2DxQl8
+.. section: Build
+
+For wasi-threads, memory is now exported to fix compatibility issues with
+some wasm runtimes.
+
+..
+
+.. date: 2023-10-17-03-10-40
+.. gh-issue: 110828
+.. nonce: 31vQ9B
+.. section: Build
+
+AIX 32bit needs ``-latomic`` to build the :mod:`!_testcapi` extension
+module.
+
+..
+
+.. date: 2023-10-17-01-56-11
+.. gh-issue: 85283
+.. nonce: V156T2
+.. section: Build
+
+The ``errno``, ``md5``, ``resource``, ``winsound``, ``_ctypes_test``,
+``_multiprocessing.posixshmem``, ``_scproxy``, ``_stat``,
+``_testimportmultiple`` and ``_uuid`` C extensions are now built with the
+:ref:`limited C API <limited-c-api>`. Patch by Victor Stinner.
+
+..
+
+.. date: 2023-11-13-22-35-27
+.. gh-issue: 111856
+.. nonce: vEtA5z
+.. section: Windows
+
+Fixes :func:`~os.fstat` on file systems that do not support file ID
+requests. This includes FAT32 and exFAT.
+
+..
+
+.. date: 2023-10-25-05-01-28
+.. gh-issue: 111293
+.. nonce: FSsLT6
+.. section: Windows
+
+Fix :data:`os.DirEntry.inode` dropping higher 64 bits of a file id on some
+filesystems on Windows.
+
+..
+
+.. date: 2023-10-19-21-46-18
+.. gh-issue: 110913
+.. nonce: CWlPfg
+.. section: Windows
+
+WindowsConsoleIO now correctly chunks large buffers without splitting up
+UTF-8 sequences.
+
+..
+
+.. date: 2023-10-31-22-13-05
+.. gh-issue: 59703
+.. nonce: SML6Ag
+.. section: macOS
+
+For macOS framework builds, in ``getpath.c`` use the system ``dladdr``
+function to find the path to the shared library rather than depending on
+deprecated macOS APIs.
+
+..
+
+.. date: 2023-10-18-17-26-36
+.. gh-issue: 110950
+.. nonce: sonoma
+.. section: macOS
+
+Update macOS installer to include an upstream Tcl/Tk fix for the ``Secure
+coding is not enabled for restorable state!`` warning encountered in Tkinter
+on macOS 14 Sonoma.
+
+..
+
+.. date: 2023-10-18-01-40-36
+.. gh-issue: 111015
+.. nonce: NaLI2L
+.. section: macOS
+
+Ensure that IDLE.app and Python Launcher.app are installed with appropriate
+permissions on macOS builds.
+
+..
+
+.. date: 2023-09-02-08-49-57
+.. gh-issue: 71383
+.. nonce: Ttkchg
+.. section: macOS
+
+Update macOS installer to include an upstream Tcl/Tk fix for the
+``ttk::ThemeChanged`` error encountered in Tkinter.
+
+..
+
+.. date: 2023-08-30-16-33-57
+.. gh-issue: 92603
+.. nonce: ATkKVO
+.. section: macOS
+
+Update macOS installer to include a fix accepted by upstream Tcl/Tk for a
+crash encountered after the first :meth:`tkinter.Tk` instance is destroyed.
+
+..
+
+.. bpo: 35668
+.. date: 2019-01-07-06-18-25
+.. nonce: JimxP5
+.. section: IDLE
+
+Add docstrings to the IDLE debugger module. Fix two bugs: initialize
+Idb.botframe (should be in Bdb); in Idb.in_rpc_code, check whether
+prev_frame is None before trying to use it. Greatly expand test_debugger.
+
+..
+
+.. date: 2023-11-09-13-04-29
+.. gh-issue: 111903
+.. nonce: 7Prryr
+.. section: Tools/Demos
+
+Argument Clinic now supports the ``@critical_section`` directive that
+instructs Argument Clinic to generate a critical section around the function
+call, which locks the ``self`` object in ``--disable-gil`` builds. Patch by
+Sam Gross.
+
+..
+
+.. date: 2023-11-15-18-36-21
+.. gh-issue: 112026
+.. nonce: _Yybr5
+.. section: C API
+
+Add again the private ``_PyThreadState_UncheckedGet()`` function as an alias
+to the new public :c:func:`PyThreadState_GetUnchecked` function. Patch by
+Victor Stinner.
+
+..
+
+.. date: 2023-11-15-17-10-09
+.. gh-issue: 112026
+.. nonce: ts9yyn
+.. section: C API
+
+Restore the removed ``_PyDict_GetItemStringWithError()`` function. It is
+used by numpy. Patch by Victor Stinner.
+
+..
+
+.. date: 2023-11-15-16-07-57
+.. gh-issue: 112026
+.. nonce: bnr8dd
+.. section: C API
+
+Restore removed private C API functions, macros and structures which have no
+simple replacement for now:
+
+* _PyDict_GetItem_KnownHash()
+* _PyDict_NewPresized()
+* _PyHASH_BITS
+* _PyHASH_IMAG
+* _PyHASH_INF
+* _PyHASH_MODULUS
+* _PyHASH_MULTIPLIER
+* _PyLong_Copy()
+* _PyLong_FromDigits()
+* _PyLong_New()
+* _PyLong_Sign()
+* _PyObject_CallMethodId()
+* _PyObject_CallMethodNoArgs()
+* _PyObject_CallMethodOneArg()
+* _PyObject_CallOneArg()
+* _PyObject_EXTRA_INIT
+* _PyObject_FastCallDict()
+* _PyObject_GetAttrId()
+* _PyObject_Vectorcall()
+* _PyObject_VectorcallMethod()
+* _PyStack_AsDict()
+* _PyThread_CurrentFrames()
+* _PyUnicodeWriter structure
+* _PyUnicodeWriter_Dealloc()
+* _PyUnicodeWriter_Finish()
+* _PyUnicodeWriter_Init()
+* _PyUnicodeWriter_Prepare()
+* _PyUnicodeWriter_PrepareKind()
+* _PyUnicodeWriter_WriteASCIIString()
+* _PyUnicodeWriter_WriteChar()
+* _PyUnicodeWriter_WriteLatin1String()
+* _PyUnicodeWriter_WriteStr()
+* _PyUnicodeWriter_WriteSubstring()
+* _PyUnicode_AsString()
+* _PyUnicode_FromId()
+* _PyVectorcall_Function()
+* _Py_IDENTIFIER()
+* _Py_c_abs()
+* _Py_c_diff()
+* _Py_c_neg()
+* _Py_c_pow()
+* _Py_c_prod()
+* _Py_c_quot()
+* _Py_c_sum()
+* _Py_static_string()
+* _Py_static_string_init()
+
+Patch by Victor Stinner.
+
+..
+
+.. date: 2023-11-13-17-57-11
+.. gh-issue: 112026
+.. nonce: WJLJcI
+.. section: C API
+
+Add again ``<ctype.h>`` and ``<unistd.h>`` includes in ``Python.h``, but
+don't include them in the limited C API version 3.13 and newer. Patch by
+Victor Stinner.
+
+..
+
+.. date: 2023-11-10-10-24-28
+.. gh-issue: 111956
+.. nonce: ImE6Cx
+.. section: C API
+
+Add internal-only one-time initialization API: ``_PyOnceFlag`` and
+``_PyOnceFlag_CallOnce``.
+
+..
+
+.. date: 2023-11-10-10-21-38
+.. gh-issue: 111262
+.. nonce: 2utB5m
+.. section: C API
+
+Add :c:func:`PyDict_Pop` and :c:func:`PyDict_PopString` functions: remove a
+key from a dictionary and optionally return the removed value. This is
+similar to :meth:`dict.pop`, but without the default value and not raising
+:exc:`KeyError` if the key missing. Patch by Stefan Behnel and Victor
+Stinner.
+
+..
+
+.. date: 2023-11-08-20-28-03
+.. gh-issue: 111863
+.. nonce: RPeFAX
+.. section: C API
+
+Rename ``Py_NOGIL`` to ``Py_GIL_DISABLED``. Patch by Hugo van Kemenade.
+
+..
+
+.. date: 2023-11-08-18-37-19
+.. gh-issue: 111138
+.. nonce: 3Ypq8h
+.. section: C API
+
+Add :c:func:`PyList_Extend` and :c:func:`PyList_Clear` functions: similar to
+Python ``list.extend()`` and ``list.clear()`` methods. Patch by Victor
+Stinner.
+
+..
+
+.. date: 2023-10-31-18-22-03
+.. gh-issue: 108765
+.. nonce: _beYv8
+.. section: C API
+
+On Windows, ``Python.h`` no longer includes the ``<stddef.h>`` standard
+header file. If needed, it should now be included explicitly. Patch by
+Victor Stinner.
+
+..
+
+.. date: 2023-10-31-14-58-17
+.. gh-issue: 111569
+.. nonce: _V8iu4
+.. section: C API
+
+Implement "Python Critical Sections" from :pep:`703`. These are macros to
+help replace the GIL with per-object locks in the ``--disable-gil`` build of
+CPython. The macros are no-ops in the default build.
+
+..
+
+.. date: 2023-10-30-18-13-01
+.. gh-issue: 111506
+.. nonce: EUdO22
+.. section: C API
+
+In the limited C API version 3.13, :c:func:`Py_SET_REFCNT` function is now
+implemented as an opaque function call. Patch by Victor Stinner.
+
+..
+
+.. date: 2023-10-19-22-39-24
+.. gh-issue: 108082
+.. nonce: uJytvc
+.. section: C API
+
+Add :c:func:`PyErr_FormatUnraisable` function.
+
+..
+
+.. date: 2023-10-17-10-21-59
+.. gh-issue: 110964
+.. nonce: OxqEjd
+.. section: C API
+
+Move the undocumented private _PyArg functions and _PyArg_Parser structure
+to internal C API (``pycore_modsupport.h``). Patch by Victor Stinner.
+
+..
+
+.. date: 2023-10-13-14-18-06
+.. gh-issue: 110815
+.. nonce: tEFLVl
+.. section: C API
+
+Support non-ASCII keyword names in :c:func:`PyArg_ParseTupleAndKeywords`.
+
+..
+
+.. date: 2023-10-02-23-08-53
+.. gh-issue: 109587
+.. nonce: UqqnDY
+.. section: C API
+
+Introduced :c:func:`PyUnstable_PerfTrampoline_CompileCode`,
+:c:func:`PyUnstable_PerfTrampoline_SetPersistAfterFork` and
+:c:func:`PyUnstable_CopyPerfMapFile`. These functions allow extension
+modules to initialize trampolines eagerly, after the application is "warmed
+up". This makes it possible to have perf-trampolines running in an
+always-enabled fashion.
+
+..
+
+.. date: 2023-08-28-17-40-51
+.. gh-issue: 85283
+.. nonce: raFNiD
+.. section: C API
+
+Add the :c:func:`PySys_Audit` function to the limited C API. Patch by Victor
+Stinner.
+
+..
+
+.. date: 2023-08-28-17-34-10
+.. gh-issue: 85283
+.. nonce: f1zXcc
+.. section: C API
+
+Add :c:func:`PyMem_RawMalloc`, :c:func:`PyMem_RawCalloc`,
+:c:func:`PyMem_RawRealloc` and :c:func:`PyMem_RawFree` to the limited C API.
+Patch by Victor Stinner.
+
+..
+
+.. date: 2023-07-12-12-14-52
+.. gh-issue: 106672
+.. nonce: fkRjmi
+.. section: C API
+
+Functions :c:func:`PyDict_GetItem`, :c:func:`PyDict_GetItemString`,
+:c:func:`PyMapping_HasKey`, :c:func:`PyMapping_HasKeyString`,
+:c:func:`PyObject_HasAttr`, :c:func:`PyObject_HasAttrString`, and
+:c:func:`PySys_GetObject`, which clear all errors occurred during calling
+the function, report now them using :func:`sys.unraisablehook`.
+
+..
+
+.. date: 2023-06-08-21-12-44
+.. gh-issue: 67565
+.. nonce: UkK3x-
+.. section: C API
+
+Remove redundant C-contiguity check in :file:`getargs.c`, :mod:`binascii`,
+:mod:`ssl` and Argument Clinic. Patched by Stefan Krah and Furkan Onder
diff --git a/Misc/NEWS.d/next/Build/2023-10-17-01-56-11.gh-issue-85283.V156T2.rst b/Misc/NEWS.d/next/Build/2023-10-17-01-56-11.gh-issue-85283.V156T2.rst
deleted file mode 100644
index 399054040f2ec7..00000000000000
--- a/Misc/NEWS.d/next/Build/2023-10-17-01-56-11.gh-issue-85283.V156T2.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-The ``errno``, ``md5``, ``resource``, ``winsound``, ``_ctypes_test``,
-``_multiprocessing.posixshmem``, ``_scproxy``, ``_stat``,
-``_testimportmultiple`` and ``_uuid`` C extensions are now built with the
-:ref:`limited C API <limited-c-api>`.
-Patch by Victor Stinner.
diff --git a/Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst b/Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst
deleted file mode 100644
index 13647fee058021..00000000000000
--- a/Misc/NEWS.d/next/Build/2023-10-17-03-10-40.gh-issue-110828.31vQ9B.rst
+++ /dev/null
@@ -1 +0,0 @@
-AIX 32bit needs ``-latomic`` to build the :mod:`!_testcapi` extension module.
diff --git a/Misc/NEWS.d/next/Build/2023-10-20-15-29-31.gh-issue-111046.2DxQl8.rst b/Misc/NEWS.d/next/Build/2023-10-20-15-29-31.gh-issue-111046.2DxQl8.rst
deleted file mode 100644
index 446b8b612862f9..00000000000000
--- a/Misc/NEWS.d/next/Build/2023-10-20-15-29-31.gh-issue-111046.2DxQl8.rst
+++ /dev/null
@@ -1 +0,0 @@
-For wasi-threads, memory is now exported to fix compatibility issues with some wasm runtimes.
diff --git a/Misc/NEWS.d/next/Build/2023-11-15-13-40-29.gh-issue-112088.UJQxxh.rst b/Misc/NEWS.d/next/Build/2023-11-15-13-40-29.gh-issue-112088.UJQxxh.rst
deleted file mode 100644
index b176d06ec8d749..00000000000000
--- a/Misc/NEWS.d/next/Build/2023-11-15-13-40-29.gh-issue-112088.UJQxxh.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Add ``Tools/build/regen-configure.sh`` script to regenerate the ``configure``
-with an Ubuntu container image. The ``quay.io/tiran/cpython_autoconf:271``
-container image (`tiran/cpython_autoconf
-<https://github.com/tiran/cpython_autoconf>`_) is no longer used. Patch by
-Victor Stinner.
diff --git a/Misc/NEWS.d/next/Build/2023-11-15-16-56-20.gh-issue-96954.6FYvKn.rst b/Misc/NEWS.d/next/Build/2023-11-15-16-56-20.gh-issue-96954.6FYvKn.rst
deleted file mode 100644
index e9a30e5f4bbaa7..00000000000000
--- a/Misc/NEWS.d/next/Build/2023-11-15-16-56-20.gh-issue-96954.6FYvKn.rst
+++ /dev/null
@@ -1 +0,0 @@
-Make ``make regen-unicodedata`` work for out-of-tree builds of CPython.
diff --git a/Misc/NEWS.d/next/C API/2023-06-08-21-12-44.gh-issue-67565.UkK3x-.rst b/Misc/NEWS.d/next/C API/2023-06-08-21-12-44.gh-issue-67565.UkK3x-.rst
deleted file mode 100644
index 0e50976b0e1ddf..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-06-08-21-12-44.gh-issue-67565.UkK3x-.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Remove redundant C-contiguity check in :file:`getargs.c`, :mod:`binascii`, :mod:`ssl` and Argument Clinic. Patched by Stefan Krah and Furkan Onder
diff --git a/Misc/NEWS.d/next/C API/2023-07-12-12-14-52.gh-issue-106672.fkRjmi.rst b/Misc/NEWS.d/next/C API/2023-07-12-12-14-52.gh-issue-106672.fkRjmi.rst
deleted file mode 100644
index 420f43175e595a..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-07-12-12-14-52.gh-issue-106672.fkRjmi.rst	
+++ /dev/null
@@ -1,5 +0,0 @@
-Functions :c:func:`PyDict_GetItem`, :c:func:`PyDict_GetItemString`,
-:c:func:`PyMapping_HasKey`, :c:func:`PyMapping_HasKeyString`,
-:c:func:`PyObject_HasAttr`, :c:func:`PyObject_HasAttrString`, and
-:c:func:`PySys_GetObject`, which clear all errors occurred during calling
-the function, report now them using :func:`sys.unraisablehook`.
diff --git a/Misc/NEWS.d/next/C API/2023-08-28-17-34-10.gh-issue-85283.f1zXcc.rst b/Misc/NEWS.d/next/C API/2023-08-28-17-34-10.gh-issue-85283.f1zXcc.rst
deleted file mode 100644
index 1c25fdb6ec8d2f..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-08-28-17-34-10.gh-issue-85283.f1zXcc.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Add :c:func:`PyMem_RawMalloc`, :c:func:`PyMem_RawCalloc`,
-:c:func:`PyMem_RawRealloc` and :c:func:`PyMem_RawFree` to the limited C API.
-Patch by Victor Stinner.
diff --git a/Misc/NEWS.d/next/C API/2023-08-28-17-40-51.gh-issue-85283.raFNiD.rst b/Misc/NEWS.d/next/C API/2023-08-28-17-40-51.gh-issue-85283.raFNiD.rst
deleted file mode 100644
index 45ffda3d23dd22..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-08-28-17-40-51.gh-issue-85283.raFNiD.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Add the :c:func:`PySys_Audit` function to the limited C API. Patch by Victor
-Stinner.
diff --git a/Misc/NEWS.d/next/C API/2023-10-02-23-08-53.gh-issue-109587.UqqnDY.rst b/Misc/NEWS.d/next/C API/2023-10-02-23-08-53.gh-issue-109587.UqqnDY.rst
deleted file mode 100644
index c6fa24f024c20c..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-10-02-23-08-53.gh-issue-109587.UqqnDY.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Introduced :c:func:`PyUnstable_PerfTrampoline_CompileCode`, :c:func:`PyUnstable_PerfTrampoline_SetPersistAfterFork` and
-:c:func:`PyUnstable_CopyPerfMapFile`. These functions allow extension modules to initialize trampolines eagerly, after the application is "warmed up". This makes it possible to have perf-trampolines running in an always-enabled fashion.
diff --git a/Misc/NEWS.d/next/C API/2023-10-13-14-18-06.gh-issue-110815.tEFLVl.rst b/Misc/NEWS.d/next/C API/2023-10-13-14-18-06.gh-issue-110815.tEFLVl.rst
deleted file mode 100644
index 216d2d211644a8..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-10-13-14-18-06.gh-issue-110815.tEFLVl.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Support non-ASCII keyword names in :c:func:`PyArg_ParseTupleAndKeywords`.
diff --git a/Misc/NEWS.d/next/C API/2023-10-17-10-21-59.gh-issue-110964.OxqEjd.rst b/Misc/NEWS.d/next/C API/2023-10-17-10-21-59.gh-issue-110964.OxqEjd.rst
deleted file mode 100644
index e45a25d8661ca4..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-10-17-10-21-59.gh-issue-110964.OxqEjd.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Move the undocumented private _PyArg functions and _PyArg_Parser structure
-to internal C API (``pycore_modsupport.h``). Patch by Victor Stinner.
diff --git a/Misc/NEWS.d/next/C API/2023-10-19-22-39-24.gh-issue-108082.uJytvc.rst b/Misc/NEWS.d/next/C API/2023-10-19-22-39-24.gh-issue-108082.uJytvc.rst
deleted file mode 100644
index b99a829e3f2a52..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-10-19-22-39-24.gh-issue-108082.uJytvc.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Add :c:func:`PyErr_FormatUnraisable` function.
diff --git a/Misc/NEWS.d/next/C API/2023-10-30-18-13-01.gh-issue-111506.EUdO22.rst b/Misc/NEWS.d/next/C API/2023-10-30-18-13-01.gh-issue-111506.EUdO22.rst
deleted file mode 100644
index f4d71fd008241a..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-10-30-18-13-01.gh-issue-111506.EUdO22.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-In the limited C API version 3.13, :c:func:`Py_SET_REFCNT` function is now
-implemented as an opaque function call. Patch by Victor Stinner.
diff --git a/Misc/NEWS.d/next/C API/2023-10-31-14-58-17.gh-issue-111569._V8iu4.rst b/Misc/NEWS.d/next/C API/2023-10-31-14-58-17.gh-issue-111569._V8iu4.rst
deleted file mode 100644
index c2bd3ae36e6439..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-10-31-14-58-17.gh-issue-111569._V8iu4.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Implement "Python Critical Sections" from :pep:`703`. These are macros to
-help replace the GIL with per-object locks in the ``--disable-gil`` build of
-CPython. The macros are no-ops in the default build.
diff --git a/Misc/NEWS.d/next/C API/2023-10-31-18-22-03.gh-issue-108765._beYv8.rst b/Misc/NEWS.d/next/C API/2023-10-31-18-22-03.gh-issue-108765._beYv8.rst
deleted file mode 100644
index 14af79eaea9a03..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-10-31-18-22-03.gh-issue-108765._beYv8.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-On Windows, ``Python.h`` no longer includes the ``<stddef.h>`` standard
-header file. If needed, it should now be included explicitly. Patch by
-Victor Stinner.
diff --git a/Misc/NEWS.d/next/C API/2023-11-08-18-37-19.gh-issue-111138.3Ypq8h.rst b/Misc/NEWS.d/next/C API/2023-11-08-18-37-19.gh-issue-111138.3Ypq8h.rst
deleted file mode 100644
index 15c3b9b3a6b9ad..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-11-08-18-37-19.gh-issue-111138.3Ypq8h.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Add :c:func:`PyList_Extend` and :c:func:`PyList_Clear` functions: similar to
-Python ``list.extend()`` and ``list.clear()`` methods. Patch by Victor Stinner.
diff --git a/Misc/NEWS.d/next/C API/2023-11-08-20-28-03.gh-issue-111863.RPeFAX.rst b/Misc/NEWS.d/next/C API/2023-11-08-20-28-03.gh-issue-111863.RPeFAX.rst
deleted file mode 100644
index 9e9145ceecf567..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-11-08-20-28-03.gh-issue-111863.RPeFAX.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Rename ``Py_NOGIL`` to ``Py_GIL_DISABLED``. Patch by Hugo van Kemenade.
diff --git a/Misc/NEWS.d/next/C API/2023-11-10-10-21-38.gh-issue-111262.2utB5m.rst b/Misc/NEWS.d/next/C API/2023-11-10-10-21-38.gh-issue-111262.2utB5m.rst
deleted file mode 100644
index d432b7ebd3a565..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-11-10-10-21-38.gh-issue-111262.2utB5m.rst	
+++ /dev/null
@@ -1,4 +0,0 @@
-Add :c:func:`PyDict_Pop` and :c:func:`PyDict_PopString` functions: remove a key
-from a dictionary and optionally return the removed value. This is similar to
-:meth:`dict.pop`, but without the default value and not raising :exc:`KeyError`
-if the key missing. Patch by Stefan Behnel and Victor Stinner.
diff --git a/Misc/NEWS.d/next/C API/2023-11-10-10-24-28.gh-issue-111956.ImE6Cx.rst b/Misc/NEWS.d/next/C API/2023-11-10-10-24-28.gh-issue-111956.ImE6Cx.rst
deleted file mode 100644
index 30ee07aa2f1f9b..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-11-10-10-24-28.gh-issue-111956.ImE6Cx.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Add internal-only one-time initialization API: ``_PyOnceFlag`` and
-``_PyOnceFlag_CallOnce``.
diff --git a/Misc/NEWS.d/next/C API/2023-11-13-17-57-11.gh-issue-112026.WJLJcI.rst b/Misc/NEWS.d/next/C API/2023-11-13-17-57-11.gh-issue-112026.WJLJcI.rst
deleted file mode 100644
index deb82ff7af7d54..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-11-13-17-57-11.gh-issue-112026.WJLJcI.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Add again ``<ctype.h>`` and ``<unistd.h>`` includes in ``Python.h``, but
-don't include them in the limited C API version 3.13 and newer. Patch by
-Victor Stinner.
diff --git a/Misc/NEWS.d/next/C API/2023-11-15-16-07-57.gh-issue-112026.bnr8dd.rst b/Misc/NEWS.d/next/C API/2023-11-15-16-07-57.gh-issue-112026.bnr8dd.rst
deleted file mode 100644
index 5dbbde88fccd2c..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-11-15-16-07-57.gh-issue-112026.bnr8dd.rst	
+++ /dev/null
@@ -1,51 +0,0 @@
-Restore removed private C API functions, macros and structures which have no
-simple replacement for now:
-
-* _PyDict_GetItem_KnownHash()
-* _PyDict_NewPresized()
-* _PyHASH_BITS
-* _PyHASH_IMAG
-* _PyHASH_INF
-* _PyHASH_MODULUS
-* _PyHASH_MULTIPLIER
-* _PyLong_Copy()
-* _PyLong_FromDigits()
-* _PyLong_New()
-* _PyLong_Sign()
-* _PyObject_CallMethodId()
-* _PyObject_CallMethodNoArgs()
-* _PyObject_CallMethodOneArg()
-* _PyObject_CallOneArg()
-* _PyObject_EXTRA_INIT
-* _PyObject_FastCallDict()
-* _PyObject_GetAttrId()
-* _PyObject_Vectorcall()
-* _PyObject_VectorcallMethod()
-* _PyStack_AsDict()
-* _PyThread_CurrentFrames()
-* _PyUnicodeWriter structure
-* _PyUnicodeWriter_Dealloc()
-* _PyUnicodeWriter_Finish()
-* _PyUnicodeWriter_Init()
-* _PyUnicodeWriter_Prepare()
-* _PyUnicodeWriter_PrepareKind()
-* _PyUnicodeWriter_WriteASCIIString()
-* _PyUnicodeWriter_WriteChar()
-* _PyUnicodeWriter_WriteLatin1String()
-* _PyUnicodeWriter_WriteStr()
-* _PyUnicodeWriter_WriteSubstring()
-* _PyUnicode_AsString()
-* _PyUnicode_FromId()
-* _PyVectorcall_Function()
-* _Py_IDENTIFIER()
-* _Py_c_abs()
-* _Py_c_diff()
-* _Py_c_neg()
-* _Py_c_pow()
-* _Py_c_prod()
-* _Py_c_quot()
-* _Py_c_sum()
-* _Py_static_string()
-* _Py_static_string_init()
-
-Patch by Victor Stinner.
diff --git a/Misc/NEWS.d/next/C API/2023-11-15-17-10-09.gh-issue-112026.ts9yyn.rst b/Misc/NEWS.d/next/C API/2023-11-15-17-10-09.gh-issue-112026.ts9yyn.rst
deleted file mode 100644
index 7d54f6b3626828..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-11-15-17-10-09.gh-issue-112026.ts9yyn.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Restore the removed ``_PyDict_GetItemStringWithError()`` function. It is
-used by numpy. Patch by Victor Stinner.
diff --git a/Misc/NEWS.d/next/C API/2023-11-15-18-36-21.gh-issue-112026._Yybr5.rst b/Misc/NEWS.d/next/C API/2023-11-15-18-36-21.gh-issue-112026._Yybr5.rst
deleted file mode 100644
index 0c39c78a78d1e0..00000000000000
--- a/Misc/NEWS.d/next/C API/2023-11-15-18-36-21.gh-issue-112026._Yybr5.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Add again the private ``_PyThreadState_UncheckedGet()`` function as an alias
-to the new public :c:func:`PyThreadState_GetUnchecked` function. Patch by
-Victor Stinner.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-11-10-10-40-05.bpo-45759.WJoB3D.rst b/Misc/NEWS.d/next/Core and Builtins/2021-11-10-10-40-05.bpo-45759.WJoB3D.rst
deleted file mode 100644
index 6d7b0209fc04b1..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2021-11-10-10-40-05.bpo-45759.WJoB3D.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Improved error messages for ``elif``/``else`` statements not matching any valid statements. Patch by Jeremiah Vivian.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2022-12-27-02-51-45.gh-issue-100445.C8f6ph.rst b/Misc/NEWS.d/next/Core and Builtins/2022-12-27-02-51-45.gh-issue-100445.C8f6ph.rst
deleted file mode 100644
index 72f38849df9b82..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2022-12-27-02-51-45.gh-issue-100445.C8f6ph.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Improve error message for unterminated strings with escapes.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-07-20-11-41-16.gh-issue-106905.AyZpuB.rst b/Misc/NEWS.d/next/Core and Builtins/2023-07-20-11-41-16.gh-issue-106905.AyZpuB.rst
deleted file mode 100644
index 73b75833a71284..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-07-20-11-41-16.gh-issue-106905.AyZpuB.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix incorrect SystemError about AST constructor recursion depth mismatch.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-08-31-11-42-16.gh-issue-106718._-57DA.rst b/Misc/NEWS.d/next/Core and Builtins/2023-08-31-11-42-16.gh-issue-106718._-57DA.rst
deleted file mode 100644
index 4c564bba4122c9..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-08-31-11-42-16.gh-issue-106718._-57DA.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-When PyConfig.stdlib_dir is explicitly set, it's now respected and won't be
-overridden by PyConfig.home.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-09-06-12-36-11.bpo-46657.xea1T_.rst b/Misc/NEWS.d/next/Core and Builtins/2023-09-06-12-36-11.bpo-46657.xea1T_.rst
deleted file mode 100644
index 193b02a3b911f5..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-09-06-12-36-11.bpo-46657.xea1T_.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Add mimalloc memory allocator support.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-09-15-23-39-43.gh-issue-103615.WZavly.rst b/Misc/NEWS.d/next/Core and Builtins/2023-09-15-23-39-43.gh-issue-103615.WZavly.rst
deleted file mode 100644
index 2a0e10b84ccf32..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-09-15-23-39-43.gh-issue-103615.WZavly.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Use local events for opcode tracing
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-09-30-17-30-11.gh-issue-89519.hz2pZf.rst b/Misc/NEWS.d/next/Core and Builtins/2023-09-30-17-30-11.gh-issue-89519.hz2pZf.rst
deleted file mode 100644
index fd9d0edf6666c7..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-09-30-17-30-11.gh-issue-89519.hz2pZf.rst	
+++ /dev/null
@@ -1,6 +0,0 @@
-Removed chained :class:`classmethod` descriptors (introduced in
-:issue:`19072`).  This can no longer be used to wrap other descriptors such
-as :class:`property`.  The core design of this feature was flawed and caused
-a number of downstream problems.  To "pass-through" a :class:`classmethod`,
-consider using the :attr:`!__wrapped__` attribute that was added in Python
-3.10.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-09-19-54-33.gh-issue-110543.1wrxO8.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-09-19-54-33.gh-issue-110543.1wrxO8.rst
deleted file mode 100644
index 5f9571566da18d..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-09-19-54-33.gh-issue-110543.1wrxO8.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix regression in Python 3.12 where :meth:`types.CodeType.replace` would
-produce a broken code object if called on a module or class code object that
-contains a comprehension. Patch by Jelle Zijlstra.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-12-12-09-01.gh-issue-110481.3Er3it.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-12-12-09-01.gh-issue-110481.3Er3it.rst
deleted file mode 100644
index 984548aced3df8..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-12-12-09-01.gh-issue-110481.3Er3it.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Implement biased reference counting in ``--disable-gil`` builds.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-12-17-15-23.gh-issue-110722.sjMwQe.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-12-17-15-23.gh-issue-110722.sjMwQe.rst
deleted file mode 100644
index 79b941ef6879f8..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-12-17-15-23.gh-issue-110722.sjMwQe.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Add :envvar:`PYTHON_PRESITE=package.module` to import a module early in the
-interpreter lifecycle before ``site.py`` is executed.  Python needs to be
-:ref:`built in debug mode <debug-build>` for this option to exist.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-13-09-21-29.gh-issue-110805.vhU7A7.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-13-09-21-29.gh-issue-110805.vhU7A7.rst
deleted file mode 100644
index be90bb3564fd54..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-13-09-21-29.gh-issue-110805.vhU7A7.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Allow the repl to show source code and complete tracebacks. Patch by Pablo
-Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-13-16-55-55.gh-issue-109094.ziL4cJ.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-13-16-55-55.gh-issue-109094.ziL4cJ.rst
deleted file mode 100644
index 332afb61e349c9..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-13-16-55-55.gh-issue-109094.ziL4cJ.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Replace ``prev_instr`` on the interpreter frame by ``instr_ptr`` which
-points to the beginning of the instruction that is currently executing (or
-will execute once the frame resumes).
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-14-12-19-34.gh-issue-110864.-baPDE.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-14-12-19-34.gh-issue-110864.-baPDE.rst
deleted file mode 100644
index 3d79a7124bd2f2..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-14-12-19-34.gh-issue-110864.-baPDE.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix argument parsing by ``_PyArg_UnpackKeywordsWithVararg`` for functions
-defining pos-or-keyword, vararg, and kw-only parameters.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-15-20-45-35.gh-issue-110892.oA6eVY.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-15-20-45-35.gh-issue-110892.oA6eVY.rst
deleted file mode 100644
index 4422273d51757c..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-15-20-45-35.gh-issue-110892.oA6eVY.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Return ``NULL`` for ``PyTrace_RETURN`` events caused by an exception
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-15-22-18-45.gh-issue-109894.UAmo06.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-15-22-18-45.gh-issue-109894.UAmo06.rst
deleted file mode 100644
index 214853660c5a57..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-15-22-18-45.gh-issue-109894.UAmo06.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fixed crash due to improperly initialized static :exc:`MemoryError` in subinterpreter.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-16-12-12-48.gh-issue-110912.uEJGi_.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-16-12-12-48.gh-issue-110912.uEJGi_.rst
deleted file mode 100644
index d70d45ebb931ea..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-16-12-12-48.gh-issue-110912.uEJGi_.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Correctly display the traceback for :exc:`MemoryError` exceptions using the
-:mod:`traceback` module. Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-16-15-51-37.gh-issue-109214.-RGTFH.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-16-15-51-37.gh-issue-109214.-RGTFH.rst
deleted file mode 100644
index c24f18cee71fa0..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-16-15-51-37.gh-issue-109214.-RGTFH.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Remove unnecessary instruction pointer updates before returning from frames.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-17-11-03-45.gh-issue-110938.X3sbMb.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-17-11-03-45.gh-issue-110938.X3sbMb.rst
deleted file mode 100644
index a2f9319e69de9b..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-17-11-03-45.gh-issue-110938.X3sbMb.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix error messages for indented blocks with functions and classes with
-generic type parameters. Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-20-23-14-06.gh-issue-111123.jjVc3M.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-20-23-14-06.gh-issue-111123.jjVc3M.rst
deleted file mode 100644
index f2cebe287db3ee..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-20-23-14-06.gh-issue-111123.jjVc3M.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix a bug where a :keyword:`global` declaration in an :keyword:`except` block
-is rejected when the global is used in the :keyword:`else` block.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-23-15-44-47.gh-issue-67224.S4D6CR.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-23-15-44-47.gh-issue-67224.S4D6CR.rst
deleted file mode 100644
index b0474f38cff6f6..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-23-15-44-47.gh-issue-67224.S4D6CR.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Show source lines in tracebacks when using the ``-c`` option when running
-Python. Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-23-22-11-09.gh-issue-94438.y2pITu.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-23-22-11-09.gh-issue-94438.y2pITu.rst
deleted file mode 100644
index b6e147a48a8cd8..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-23-22-11-09.gh-issue-94438.y2pITu.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix a regression that prevented jumping across ``is None`` and ``is not None`` when debugging. Patch by Savannah Ostrowski.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-26-18-45-20.gh-issue-111354.GrT-Wf.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-26-18-45-20.gh-issue-111354.GrT-Wf.rst
deleted file mode 100644
index 96798701066df9..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-26-18-45-20.gh-issue-111354.GrT-Wf.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Remove ``oparg`` from :opcode:`YIELD_VALUE`. Change ``oparg`` of
-:opcode:`RESUME` to include information about the except-depth.
-These changes make it possible to simplify the code in generator close.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-27-11-22-09.gh-issue-111374.e9lrPZ.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-27-11-22-09.gh-issue-111374.e9lrPZ.rst
deleted file mode 100644
index 6f18339112466d..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-27-11-22-09.gh-issue-111374.e9lrPZ.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Added a new environment variable :envvar:`PYTHON_FROZEN_MODULES`. It
-determines whether or not frozen modules are ignored by the import machinery,
-equivalent of the :option:`-X frozen_modules <-X>` command-line option.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-27-11-51-40.gh-issue-111380.vgSbir.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-27-11-51-40.gh-issue-111380.vgSbir.rst
deleted file mode 100644
index 4ce6398dbfe3b1..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-27-11-51-40.gh-issue-111380.vgSbir.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix a bug that was causing :exc:`SyntaxWarning` to appear twice when parsing
-if invalid syntax is encountered later. Patch by Pablo galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-27-12-17-49.gh-issue-111366._TSknV.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-27-12-17-49.gh-issue-111366._TSknV.rst
deleted file mode 100644
index 7e76ce916ea714..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-27-12-17-49.gh-issue-111366._TSknV.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix an issue in the :mod:`codeop` that was causing :exc:`SyntaxError`
-exceptions raised in the presence of invalid syntax to not contain precise
-error messages. Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-27-19-38-33.gh-issue-102388.vd5YUZ.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-27-19-38-33.gh-issue-102388.vd5YUZ.rst
deleted file mode 100644
index 268a3d310f2b49..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-27-19-38-33.gh-issue-102388.vd5YUZ.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Fix a bug where ``iso2022_jp_3`` and ``iso2022_jp_2004`` codecs read out of bounds
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-29-11-35-21.gh-issue-111435.ageUWQ.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-29-11-35-21.gh-issue-111435.ageUWQ.rst
deleted file mode 100644
index 034615581b6789..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-29-11-35-21.gh-issue-111435.ageUWQ.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Add support for sharing of True and False between interpreters using the cross-interpreter
-API.  Patch by Anthony Shaw.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-29-12-33-33.gh-issue-111438.bHTLLl.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-29-12-33-33.gh-issue-111438.bHTLLl.rst
deleted file mode 100644
index 009ba11ae16683..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-29-12-33-33.gh-issue-111438.bHTLLl.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Add support for sharing floats between interpreters using the cross-interpreter
-API.  Patch by Anthony Shaw.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-29-20-11-21.gh-issue-111420.IUT-GK.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-29-20-11-21.gh-issue-111420.IUT-GK.rst
deleted file mode 100644
index 6646ecf920eeb5..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-29-20-11-21.gh-issue-111420.IUT-GK.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Allow type comments in parenthesized ``with`` statements
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-31-14-25-21.gh-issue-109181.11h6Mc.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-31-14-25-21.gh-issue-109181.11h6Mc.rst
deleted file mode 100644
index 61a15b471cfb27..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-31-14-25-21.gh-issue-109181.11h6Mc.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Speed up :obj:`Traceback` object creation by lazily compute the line number.
-Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-10-31-21-33-35.gh-issue-111520.vw-rxJ.rst b/Misc/NEWS.d/next/Core and Builtins/2023-10-31-21-33-35.gh-issue-111520.vw-rxJ.rst
deleted file mode 100644
index 67ca9c6671f99b..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-10-31-21-33-35.gh-issue-111520.vw-rxJ.rst	
+++ /dev/null
@@ -1,9 +0,0 @@
-Merge the Tier 1 (bytecode) and Tier 2 (micro-ops) interpreters together,
-moving the Tier 2 interpreter loop and switch into
-``_PyEval_EvalFrameDefault()`` in ``Python/ceval.c``.
-The ``Python/executor.c`` file is gone.
-Also the ``TIER_ONE`` and ``TIER_TWO`` macros are now handled
-by the code generator.
-
-**Beware!** This changes the environment variables to enable micro-ops and
-their debugging to ``PYTHON_UOPS`` and ``PYTHON_LLTRACE``.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-02-14-49-19.gh-issue-111354.gIS3f-.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-02-14-49-19.gh-issue-111354.gIS3f-.rst
deleted file mode 100644
index 21d45340489caa..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-02-14-49-19.gh-issue-111354.gIS3f-.rst	
+++ /dev/null
@@ -1,5 +0,0 @@
-The oparg of :opcode:`YIELD_VALUE` is now ``1`` if the instruction is part
-of a yield-from or await, and ``0`` otherwise.
-
-The SUSPENDED frame state is now split into ``SUSPENDED`` and
-``SUSPENDED_YIELD_FROM``. This simplifies the code in ``_PyGen_yf``.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-02-15-00-57.gh-issue-111623.BZxYc8.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-02-15-00-57.gh-issue-111623.BZxYc8.rst
deleted file mode 100644
index 3a75d5e36841b4..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-02-15-00-57.gh-issue-111623.BZxYc8.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Add support for sharing tuples between interpreters using the cross-interpreter
-API.  Patch by Anthony Shaw.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-03-01-04-55.gh-issue-111654.scUhDO.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-03-01-04-55.gh-issue-111654.scUhDO.rst
deleted file mode 100644
index e9a896e660916f..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-03-01-04-55.gh-issue-111654.scUhDO.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix runtime crash when some error happens in opcode
-``LOAD_FROM_DICT_OR_DEREF``.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-03-01-23-48.gh-issue-111666.l8Q8G5.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-03-01-23-48.gh-issue-111666.l8Q8G5.rst
deleted file mode 100644
index 1d742a7c918599..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-03-01-23-48.gh-issue-111666.l8Q8G5.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Speed up :meth:`BaseExceptionGroup.derive`,
-:meth:`BaseExceptionGroup.subgroup`, and :meth:`BaseExceptionGroup.split` by
-changing how they parse passed arguments.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-03-19-25-38.gh-issue-111772.aRQvOn.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-03-19-25-38.gh-issue-111772.aRQvOn.rst
deleted file mode 100644
index 79ae5ab4c8ff3b..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-03-19-25-38.gh-issue-111772.aRQvOn.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Specialize slot loads and stores for _Py_T_OBJECT as well as Py_T_OBJECT_EX
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-03-22-48-29.gh-issue-109369.ELYaxJ.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-03-22-48-29.gh-issue-109369.ELYaxJ.rst
deleted file mode 100644
index 1a73afca756f9e..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-03-22-48-29.gh-issue-109369.ELYaxJ.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Make sure that tier 2 traces are de-optimized if the code is instrumented
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-04-13-36-51.gh-issue-110829.Pa0CJI.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-04-13-36-51.gh-issue-110829.Pa0CJI.rst
deleted file mode 100644
index f4fa61db369ece..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-04-13-36-51.gh-issue-110829.Pa0CJI.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Joining a thread now ensures the underlying OS thread has exited. This is required for safer fork() in multi-threaded processes.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-05-06-40-35.gh-issue-111843.c045cB.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-05-06-40-35.gh-issue-111843.c045cB.rst
deleted file mode 100644
index 280f8f9bf0b8c0..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-05-06-40-35.gh-issue-111843.c045cB.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Use exponential backoff to reduce the number of failed tier 2 optimization
-attempts by over 99%.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-05-20-59-10.gh-issue-81925.wKHLSS.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-05-20-59-10.gh-issue-81925.wKHLSS.rst
deleted file mode 100644
index 9caa5cf6abe1ff..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-05-20-59-10.gh-issue-81925.wKHLSS.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Implement native thread ids for GNU KFreeBSD.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-06-16-44-09.gh-issue-79932.2qv7uD.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-06-16-44-09.gh-issue-79932.2qv7uD.rst
deleted file mode 100644
index 543dbe4413027a..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-06-16-44-09.gh-issue-79932.2qv7uD.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Raise exception if :meth:`frame.clear` is called on a suspended frame.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-07-12-59-02.gh-issue-81137.qFpJCY.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-07-12-59-02.gh-issue-81137.qFpJCY.rst
deleted file mode 100644
index 5ca1dda63cb222..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-07-12-59-02.gh-issue-81137.qFpJCY.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Deprecate assignment to a function's ``__code__`` field when the new code
-object is of a mismatched type (e.g., from a generator to a plain function).
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-14-22-12-11.gh-issue-111916.ZGCayL.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-14-22-12-11.gh-issue-111916.ZGCayL.rst
deleted file mode 100644
index b3814828e476b9..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-14-22-12-11.gh-issue-111916.ZGCayL.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Make hashlib related modules thread-safe without the GIL
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-15-16-14-10.gh-issue-106529.Y48ax9.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-15-16-14-10.gh-issue-106529.Y48ax9.rst
deleted file mode 100644
index b2a34ac735cdeb..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-15-16-14-10.gh-issue-106529.Y48ax9.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Enable translating unspecialized ``FOR_ITER`` to Tier 2.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-15-20-20-51.gh-issue-111798.cs-3t3.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-15-20-20-51.gh-issue-111798.cs-3t3.rst
deleted file mode 100644
index 24bb4ec096c2d1..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-15-20-20-51.gh-issue-111798.cs-3t3.rst	
+++ /dev/null
@@ -1,4 +0,0 @@
-When Python is built in debug mode, set the C recursion limit to 500 instead
-of 1500. A debug build is likely built with low optimization level which
-implies higher stack memory usage than a release build. Patch by Victor
-Stinner.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-17-16-49-32.gh-issue-111807.QvjP9_.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-17-16-49-32.gh-issue-111807.QvjP9_.rst
deleted file mode 100644
index 6f075845e11b86..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-17-16-49-32.gh-issue-111807.QvjP9_.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Lower the max parser stack depth to 1000 under WASI debug builds.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-19-15-57-23.gh-issue-112266.BSJMbR.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-19-15-57-23.gh-issue-112266.BSJMbR.rst
deleted file mode 100644
index 18433db9bb976e..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-19-15-57-23.gh-issue-112266.BSJMbR.rst	
+++ /dev/null
@@ -1,2 +0,0 @@
-Change docstrings of :attr:`~object.__dict__` and
-:attr:`~object.__weakref__`.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-20-10-40-40.gh-issue-112287.15gWAK.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-20-10-40-40.gh-issue-112287.15gWAK.rst
deleted file mode 100644
index 3f31a0f55ca44e..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-20-10-40-40.gh-issue-112287.15gWAK.rst	
+++ /dev/null
@@ -1,3 +0,0 @@
-Slightly optimize the Tier 2 (uop) interpreter by only loading ``oparg`` and
-``operand`` when needed. Also double the trace size limit again, to 512 this
-time.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2023-11-20-14-13-02.gh-issue-112243.FKdQnr.rst b/Misc/NEWS.d/next/Core and Builtins/2023-11-20-14-13-02.gh-issue-112243.FKdQnr.rst
deleted file mode 100644
index d69f29f5c63490..00000000000000
--- a/Misc/NEWS.d/next/Core and Builtins/2023-11-20-14-13-02.gh-issue-112243.FKdQnr.rst	
+++ /dev/null
@@ -1 +0,0 @@
-Don't include comments in f-string debug expressions. Patch by Pablo Galindo
diff --git a/Misc/NEWS.d/next/IDLE/2019-01-07-06-18-25.bpo-35668.JimxP5.rst b/Misc/NEWS.d/next/IDLE/2019-01-07-06-18-25.bpo-35668.JimxP5.rst
deleted file mode 100644
index 8bb5420517d55f..00000000000000
--- a/Misc/NEWS.d/next/IDLE/2019-01-07-06-18-25.bpo-35668.JimxP5.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Add docstrings to the IDLE debugger module. Fix two bugs:
-initialize Idb.botframe (should be in Bdb); in Idb.in_rpc_code,
-check whether prev_frame is None before trying to use it.
-Greatly expand test_debugger.
diff --git a/Misc/NEWS.d/next/Library/2022-05-06-15-49-57.gh-issue-86826.rf006W.rst b/Misc/NEWS.d/next/Library/2022-05-06-15-49-57.gh-issue-86826.rf006W.rst
deleted file mode 100644
index 02cd75eec4be9e..00000000000000
--- a/Misc/NEWS.d/next/Library/2022-05-06-15-49-57.gh-issue-86826.rf006W.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-:mod:`zipinfo` now supports the full range of values in the TZ string
-determined by RFC 8536 and detects all invalid formats.
-Both Python and C implementations now raise exceptions of the same
-type on invalid data.
diff --git a/Misc/NEWS.d/next/Library/2022-05-28-20-55-07.gh-issue-73561.YRmAvy.rst b/Misc/NEWS.d/next/Library/2022-05-28-20-55-07.gh-issue-73561.YRmAvy.rst
deleted file mode 100644
index 5e00b7d20b8ca8..00000000000000
--- a/Misc/NEWS.d/next/Library/2022-05-28-20-55-07.gh-issue-73561.YRmAvy.rst
+++ /dev/null
@@ -1 +0,0 @@
-Omit the interface scope from an IPv6 address when used as Host header by :mod:`http.client`.
diff --git a/Misc/NEWS.d/next/Library/2022-10-05-15-01-36.gh-issue-96954.ezwkrU.rst b/Misc/NEWS.d/next/Library/2022-10-05-15-01-36.gh-issue-96954.ezwkrU.rst
deleted file mode 100644
index f4886bd3cc27f5..00000000000000
--- a/Misc/NEWS.d/next/Library/2022-10-05-15-01-36.gh-issue-96954.ezwkrU.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Switch the storage of the unicode codepoint names to use a different
-data-structure, a `directed acyclic word graph
-<https://en.wikipedia.org/wiki/Deterministic_acyclic_finite_state_automaton>`_.
-This makes the unicodedata shared library about 440 KiB smaller. Contributed by
-Carl Friedrich Bolz-Tereick using code from the PyPy project.
diff --git a/Misc/NEWS.d/next/Library/2022-10-14-21-11-10.gh-issue-97928.Pdxh1G.rst b/Misc/NEWS.d/next/Library/2022-10-14-21-11-10.gh-issue-97928.Pdxh1G.rst
deleted file mode 100644
index 4acf396f840d61..00000000000000
--- a/Misc/NEWS.d/next/Library/2022-10-14-21-11-10.gh-issue-97928.Pdxh1G.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Change the behavior of :meth:`tkinter.Text.count`. It now always returns an
-integer if one or less counting options are specified. Previously it could
-return a single count as a 1-tuple, an integer (only if option ``"update"``
-was specified) or ``None`` if no items found. The result is now the same if
-``wantobjects`` is set to ``0``.
-
diff --git a/Misc/NEWS.d/next/Library/2023-03-22-02-01-30.gh-issue-102895.HiEqaZ.rst b/Misc/NEWS.d/next/Library/2023-03-22-02-01-30.gh-issue-102895.HiEqaZ.rst
deleted file mode 100644
index 20a1a5baccd24b..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-03-22-02-01-30.gh-issue-102895.HiEqaZ.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added a parameter ``local_exit`` for :func:`code.interact` to prevent ``exit()`` and ``quit`` from closing ``sys.stdin`` and raise ``SystemExit``.
diff --git a/Misc/NEWS.d/next/Library/2023-04-15-14-45-21.gh-issue-102956.Z6qeUy.rst b/Misc/NEWS.d/next/Library/2023-04-15-14-45-21.gh-issue-102956.Z6qeUy.rst
deleted file mode 100644
index 1a4bb9bc0dc46a..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-04-15-14-45-21.gh-issue-102956.Z6qeUy.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix returning of empty byte strings after seek in zipfile module
diff --git a/Misc/NEWS.d/next/Library/2023-04-26-16-37-00.gh-issue-90890.fIag4w.rst b/Misc/NEWS.d/next/Library/2023-04-26-16-37-00.gh-issue-90890.fIag4w.rst
deleted file mode 100644
index ee2e69eb27980f..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-04-26-16-37-00.gh-issue-90890.fIag4w.rst
+++ /dev/null
@@ -1,7 +0,0 @@
-New methods :meth:`mailbox.Maildir.get_info`,
-:meth:`mailbox.Maildir.set_info`, :meth:`mailbox.Maildir.get_flags`,
-:meth:`mailbox.Maildir.set_flags`, :meth:`mailbox.Maildir.add_flag`,
-:meth:`mailbox.Maildir.remove_flag`. These methods speed up accessing a
-message's info and/or flags and are useful when it is not necessary to
-access the message's contents, as when iterating over a Maildir to find
-messages with specific flags.
diff --git a/Misc/NEWS.d/next/Library/2023-05-30-02-01-14.gh-issue-90026.FyCXw8.rst b/Misc/NEWS.d/next/Library/2023-05-30-02-01-14.gh-issue-90026.FyCXw8.rst
deleted file mode 100644
index 3e32c9836f0cff..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-05-30-02-01-14.gh-issue-90026.FyCXw8.rst
+++ /dev/null
@@ -1 +0,0 @@
-Define ``USE_XATTRS`` on Cygwin so that XATTR-related functions in the :mod:`os` module become available.
diff --git a/Misc/NEWS.d/next/Library/2023-07-13-00-24-52.gh-issue-72904.Yn5-j0.rst b/Misc/NEWS.d/next/Library/2023-07-13-00-24-52.gh-issue-72904.Yn5-j0.rst
deleted file mode 100644
index edc8ab07bb06b3..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-07-13-00-24-52.gh-issue-72904.Yn5-j0.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Add :func:`glob.translate`. This function converts a pathname with shell-style
-wildcards to a regular expression.
diff --git a/Misc/NEWS.d/next/Library/2023-07-29-19-00-39.gh-issue-107431.1GzJ2p.rst b/Misc/NEWS.d/next/Library/2023-07-29-19-00-39.gh-issue-107431.1GzJ2p.rst
deleted file mode 100644
index fb5bd8cb7cad47..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-07-29-19-00-39.gh-issue-107431.1GzJ2p.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Make the ``DictProxy`` and ``ListProxy`` types in :mod:`multiprocessing.managers`
-:ref:`Generic Alias Types<types-genericalias>` for ``[]`` use in typing contexts.
diff --git a/Misc/NEWS.d/next/Library/2023-08-30-19-10-35.gh-issue-105931.Lpwve8.rst b/Misc/NEWS.d/next/Library/2023-08-30-19-10-35.gh-issue-105931.Lpwve8.rst
deleted file mode 100644
index 4e769ec4c47561..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-08-30-19-10-35.gh-issue-105931.Lpwve8.rst
+++ /dev/null
@@ -1,8 +0,0 @@
-Change :mod:`compileall` to only strip the stripdir prefix from the full path
-recorded in the compiled ``.pyc`` file, when the prefix matches the start of
-the full path in its entirety. When the prefix does not match, no stripping is
-performed and a warning to this effect is displayed.
-
-Previously all path components of the stripdir prefix that matched the full
-path were removed, while those that did not match were left alone (including
-ones interspersed between matching components).
diff --git a/Misc/NEWS.d/next/Library/2023-09-02-16-07-23.gh-issue-108791.fBcAqh.rst b/Misc/NEWS.d/next/Library/2023-09-02-16-07-23.gh-issue-108791.fBcAqh.rst
deleted file mode 100644
index 84a2cd589e10d5..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-09-02-16-07-23.gh-issue-108791.fBcAqh.rst
+++ /dev/null
@@ -1 +0,0 @@
-Improved error handling in :mod:`pdb` command line interface, making it produce more concise error messages.
diff --git a/Misc/NEWS.d/next/Library/2023-09-08-12-10-10.gh-issue-85098.DfQbeJ.rst b/Misc/NEWS.d/next/Library/2023-09-08-12-10-10.gh-issue-85098.DfQbeJ.rst
deleted file mode 100644
index cf0e782237b2c0..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-09-08-12-10-10.gh-issue-85098.DfQbeJ.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Implement the CLI of the :mod:`symtable` module and improve the repr of
-:class:`~symtable.Symbol`.
diff --git a/Misc/NEWS.d/next/Library/2023-09-15-12-30-21.gh-issue-109466.6ah-aw.rst b/Misc/NEWS.d/next/Library/2023-09-15-12-30-21.gh-issue-109466.6ah-aw.rst
deleted file mode 100644
index e8e5be320ea805..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-09-15-12-30-21.gh-issue-109466.6ah-aw.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add the :attr:`ipaddress.IPv4Address.ipv6_mapped` property, which retuns the IPv4-mapped IPv6 address.
diff --git a/Misc/NEWS.d/next/Library/2023-09-25-20-05-41.gh-issue-109747._cRJH8.rst b/Misc/NEWS.d/next/Library/2023-09-25-20-05-41.gh-issue-109747._cRJH8.rst
deleted file mode 100644
index b64ba627897a1a..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-09-25-20-05-41.gh-issue-109747._cRJH8.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Improve errors for unsupported look-behind patterns. Now re.error is raised
-instead of OverflowError or RuntimeError for too large width of look-behind
-pattern.
diff --git a/Misc/NEWS.d/next/Library/2023-10-02-05-23-27.gh-issue-110196.djwt0z.rst b/Misc/NEWS.d/next/Library/2023-10-02-05-23-27.gh-issue-110196.djwt0z.rst
deleted file mode 100644
index 341f3380fffd60..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-02-05-23-27.gh-issue-110196.djwt0z.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add ``__reduce__`` method to :class:`IPv6Address` in order to keep ``scope_id``
diff --git a/Misc/NEWS.d/next/Library/2023-10-08-14-17-06.gh-issue-110395._tdCsV.rst b/Misc/NEWS.d/next/Library/2023-10-08-14-17-06.gh-issue-110395._tdCsV.rst
deleted file mode 100644
index eb9bcf1f337fb3..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-08-14-17-06.gh-issue-110395._tdCsV.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Ensure that :func:`select.kqueue` objects correctly appear as closed in
-forked children, to prevent operations on an invalid file descriptor.
diff --git a/Misc/NEWS.d/next/Library/2023-10-08-18-38-09.gh-issue-88434.2Q_IkG.rst b/Misc/NEWS.d/next/Library/2023-10-08-18-38-09.gh-issue-88434.2Q_IkG.rst
deleted file mode 100644
index 9722be251bfcad..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-08-18-38-09.gh-issue-88434.2Q_IkG.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Emit deprecation warning for non-integer numbers in :mod:`gettext` functions
-and methods that consider plural forms even if the translation was not
-found.
diff --git a/Misc/NEWS.d/next/Library/2023-10-09-23-59-04.gh-issue-59013.qPbS-G.rst b/Misc/NEWS.d/next/Library/2023-10-09-23-59-04.gh-issue-59013.qPbS-G.rst
deleted file mode 100644
index 57915f5fb4368d..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-09-23-59-04.gh-issue-59013.qPbS-G.rst
+++ /dev/null
@@ -1 +0,0 @@
-Make line number of function breakpoint more precise in :mod:`pdb`
diff --git a/Misc/NEWS.d/next/Library/2023-10-10-17-56-41.gh-issue-110392.6g6CnP.rst b/Misc/NEWS.d/next/Library/2023-10-10-17-56-41.gh-issue-110392.6g6CnP.rst
deleted file mode 100644
index 47e4e8ee1f058d..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-10-17-56-41.gh-issue-110392.6g6CnP.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Fix :func:`tty.setraw` and :func:`tty.setcbreak`: previously they returned
-partially modified list of the original tty attributes.
-:func:`tty.cfmakeraw` and :func:`tty.cfmakecbreak` now make a copy of the
-list of special characters before modifying it.
diff --git a/Misc/NEWS.d/next/Library/2023-10-12-15-16-44.gh-issue-110774.AdCb5A.rst b/Misc/NEWS.d/next/Library/2023-10-12-15-16-44.gh-issue-110774.AdCb5A.rst
deleted file mode 100644
index a5a9fed11864d6..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-12-15-16-44.gh-issue-110774.AdCb5A.rst
+++ /dev/null
@@ -1 +0,0 @@
-Support setting the :class:`asyncio.Runner` loop_factory kwarg in :class:`unittest.IsolatedAsyncioTestCase`
diff --git a/Misc/NEWS.d/next/Library/2023-10-13-06-47-20.gh-issue-110771.opwdlc.rst b/Misc/NEWS.d/next/Library/2023-10-13-06-47-20.gh-issue-110771.opwdlc.rst
deleted file mode 100644
index a22f8a0d5e56c3..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-13-06-47-20.gh-issue-110771.opwdlc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Expose the setup and cleanup portions of ``asyncio.run_forever()`` as the standalone methods ``asyncio.run_forever_setup()`` and ``asyncio.run_forever_cleanup()``. This allows for tighter integration with GUI event loops.
diff --git a/Misc/NEWS.d/next/Library/2023-10-14-20-15-53.gh-issue-80675._M-cQC.rst b/Misc/NEWS.d/next/Library/2023-10-14-20-15-53.gh-issue-80675._M-cQC.rst
deleted file mode 100644
index a4bc679be905d6..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-14-20-15-53.gh-issue-80675._M-cQC.rst
+++ /dev/null
@@ -1 +0,0 @@
-Set ``f_trace_lines = True`` on all frames upon :func:`pdb.set_trace()`
diff --git a/Misc/NEWS.d/next/Library/2023-10-14-21-33-57.gh-issue-84583.-Cmn4_.rst b/Misc/NEWS.d/next/Library/2023-10-14-21-33-57.gh-issue-84583.-Cmn4_.rst
deleted file mode 100644
index aa86da461a0b6d..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-14-21-33-57.gh-issue-84583.-Cmn4_.rst
+++ /dev/null
@@ -1 +0,0 @@
-Make :mod:`pdb` enter post-mortem mode even for :exc:`SyntaxError`
diff --git a/Misc/NEWS.d/next/Library/2023-10-15-08-08-26.gh-issue-110745.mxEkh0.rst b/Misc/NEWS.d/next/Library/2023-10-15-08-08-26.gh-issue-110745.mxEkh0.rst
deleted file mode 100644
index b99f968dc20ae9..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-15-08-08-26.gh-issue-110745.mxEkh0.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Added *newline* parameter to :meth:`pathlib.Path.read_text`.
-Patch by Junya Okabe.
diff --git a/Misc/NEWS.d/next/Library/2023-10-16-18-41-51.gh-issue-110944.CmUKXo.rst b/Misc/NEWS.d/next/Library/2023-10-16-18-41-51.gh-issue-110944.CmUKXo.rst
deleted file mode 100644
index ec9ca5a11f1ac8..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-16-18-41-51.gh-issue-110944.CmUKXo.rst
+++ /dev/null
@@ -1 +0,0 @@
-Support alias and convenience vars for :mod:`pdb` completion
diff --git a/Misc/NEWS.d/next/Library/2023-10-19-22-46-34.gh-issue-111092.hgut12.rst b/Misc/NEWS.d/next/Library/2023-10-19-22-46-34.gh-issue-111092.hgut12.rst
deleted file mode 100644
index 487bd177d27e31..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-19-22-46-34.gh-issue-111092.hgut12.rst
+++ /dev/null
@@ -1 +0,0 @@
-Make turtledemo run without default root enabled.
diff --git a/Misc/NEWS.d/next/Library/2023-10-20-15-29-10.gh-issue-110910.u2oPwX.rst b/Misc/NEWS.d/next/Library/2023-10-20-15-29-10.gh-issue-110910.u2oPwX.rst
deleted file mode 100644
index c750447e9fe4a5..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-20-15-29-10.gh-issue-110910.u2oPwX.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Fix invalid state handling in :class:`asyncio.TaskGroup` and
-:class:`asyncio.Timeout`. They now raise proper RuntimeError if they are
-improperly used and are left in consistent state after this.
diff --git a/Misc/NEWS.d/next/Library/2023-10-21-13-57-06.gh-issue-111159.GoHp7s.rst b/Misc/NEWS.d/next/Library/2023-10-21-13-57-06.gh-issue-111159.GoHp7s.rst
deleted file mode 100644
index bdec4f4443d80b..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-21-13-57-06.gh-issue-111159.GoHp7s.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix :mod:`doctest` output comparison for exceptions with notes.
diff --git a/Misc/NEWS.d/next/Library/2023-10-22-21-28-05.gh-issue-111187._W11Ab.rst b/Misc/NEWS.d/next/Library/2023-10-22-21-28-05.gh-issue-111187._W11Ab.rst
deleted file mode 100644
index dc2424370bb96c..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-22-21-28-05.gh-issue-111187._W11Ab.rst
+++ /dev/null
@@ -1 +0,0 @@
-Postpone removal version for locale.getdefaultlocale() to Python 3.15.
diff --git a/Misc/NEWS.d/next/Library/2023-10-23-13-53-58.gh-issue-111174.Oohmzd.rst b/Misc/NEWS.d/next/Library/2023-10-23-13-53-58.gh-issue-111174.Oohmzd.rst
deleted file mode 100644
index 95c315404d0ee6..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-23-13-53-58.gh-issue-111174.Oohmzd.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix crash in :meth:`io.BytesIO.getbuffer` called repeatedly for empty
-BytesIO.
diff --git a/Misc/NEWS.d/next/Library/2023-10-23-22-40-47.gh-issue-111230.k3Jm84.rst b/Misc/NEWS.d/next/Library/2023-10-23-22-40-47.gh-issue-111230.k3Jm84.rst
deleted file mode 100644
index 61d035853db070..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-23-22-40-47.gh-issue-111230.k3Jm84.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix :mod:`ssl` not checking for errors when initializing.
diff --git a/Misc/NEWS.d/next/Library/2023-10-23-23-14-54.gh-issue-111233.sCdCC0.rst b/Misc/NEWS.d/next/Library/2023-10-23-23-14-54.gh-issue-111233.sCdCC0.rst
deleted file mode 100644
index 86d622a74095ab..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-23-23-14-54.gh-issue-111233.sCdCC0.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix :mod:`select` not checking for errors when initializing.
diff --git a/Misc/NEWS.d/next/Library/2023-10-24-12-09-46.gh-issue-111251.urFYtn.rst b/Misc/NEWS.d/next/Library/2023-10-24-12-09-46.gh-issue-111251.urFYtn.rst
deleted file mode 100644
index 3a87cb25da5cb4..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-24-12-09-46.gh-issue-111251.urFYtn.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix :mod:`_blake2` not checking for errors when initializing.
diff --git a/Misc/NEWS.d/next/Library/2023-10-24-12-20-46.gh-issue-111253.HFywSK.rst b/Misc/NEWS.d/next/Library/2023-10-24-12-20-46.gh-issue-111253.HFywSK.rst
deleted file mode 100644
index e21a42605aeaf6..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-24-12-20-46.gh-issue-111253.HFywSK.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add error checking during :mod:`!_socket` module init.
diff --git a/Misc/NEWS.d/next/Library/2023-10-25-08-42-05.gh-issue-111295.H2K4lf.rst b/Misc/NEWS.d/next/Library/2023-10-25-08-42-05.gh-issue-111295.H2K4lf.rst
deleted file mode 100644
index 28b85ec3eadab7..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-25-08-42-05.gh-issue-111295.H2K4lf.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix :mod:`time` not checking for errors when initializing.
diff --git a/Misc/NEWS.d/next/Library/2023-10-25-11-13-35.gh-issue-111259.z7ndeA.rst b/Misc/NEWS.d/next/Library/2023-10-25-11-13-35.gh-issue-111259.z7ndeA.rst
deleted file mode 100644
index 4b597f51a955a7..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-25-11-13-35.gh-issue-111259.z7ndeA.rst
+++ /dev/null
@@ -1 +0,0 @@
-Optimize recursive wildcards in :mod:`pathlib`.
diff --git a/Misc/NEWS.d/next/Library/2023-10-25-11-54-00.gh-issue-79033.5ePgFl.rst b/Misc/NEWS.d/next/Library/2023-10-25-11-54-00.gh-issue-79033.5ePgFl.rst
deleted file mode 100644
index f131bf590870ad..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-25-11-54-00.gh-issue-79033.5ePgFl.rst
+++ /dev/null
@@ -1,6 +0,0 @@
-Another attempt at fixing :func:`asyncio.Server.wait_closed()`. It now
-blocks until both conditions are true: the server is closed, *and* there
-are no more active connections. (This means that in some cases where in
-3.12.0 this function would *incorrectly* have returned immediately,
-it will now block; in particular, when there are no active connections
-but the server hasn't been closed yet.)
diff --git a/Misc/NEWS.d/next/Library/2023-10-27-09-56-20.gh-issue-111388.SlmDbC.rst b/Misc/NEWS.d/next/Library/2023-10-27-09-56-20.gh-issue-111388.SlmDbC.rst
deleted file mode 100644
index 353196439a9cff..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-27-09-56-20.gh-issue-111388.SlmDbC.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Add ``show_group`` parameter to :func:`traceback.format_exception_only`,
-which allows to format :exc:`ExceptionGroup` instances.
diff --git a/Misc/NEWS.d/next/Library/2023-10-27-12-46-56.gh-issue-68166.0EbWW4.rst b/Misc/NEWS.d/next/Library/2023-10-27-12-46-56.gh-issue-68166.0EbWW4.rst
deleted file mode 100644
index 757a7004cc1dc0..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-27-12-46-56.gh-issue-68166.0EbWW4.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Remove mention of not supported "vsapi" element type in
-:meth:`tkinter.ttk.Style.element_create`. Add tests for ``element_create()``
-and other ``ttk.Style`` methods. Add examples for ``element_create()`` in
-the documentation.
diff --git a/Misc/NEWS.d/next/Library/2023-10-28-04-21-17.gh-issue-111342.m8Ln1k.rst b/Misc/NEWS.d/next/Library/2023-10-28-04-21-17.gh-issue-111342.m8Ln1k.rst
deleted file mode 100644
index 57707fd4acf1b2..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-28-04-21-17.gh-issue-111342.m8Ln1k.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed typo in :func:`math.sumprod`.
diff --git a/Misc/NEWS.d/next/Library/2023-10-28-22-11-11.gh-issue-111429.mJGxuQ.rst b/Misc/NEWS.d/next/Library/2023-10-28-22-11-11.gh-issue-111429.mJGxuQ.rst
deleted file mode 100644
index c8bc4c5295a106..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-28-22-11-11.gh-issue-111429.mJGxuQ.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Speed up :meth:`pathlib.PurePath.relative_to` and
-:meth:`~pathlib.PurePath.is_relative_to`.
diff --git a/Misc/NEWS.d/next/Library/2023-10-29-03-46-27.gh-issue-66425.FWTdDo.rst b/Misc/NEWS.d/next/Library/2023-10-29-03-46-27.gh-issue-66425.FWTdDo.rst
deleted file mode 100644
index e7ede35891fb33..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-29-03-46-27.gh-issue-66425.FWTdDo.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Remove the code to set the REMOTE_HOST header from wsgiref module,
-as it is unreachable. This header is used for performance reasons,
-which is not necessary in the wsgiref module.
diff --git a/Misc/NEWS.d/next/Library/2023-10-30-08-50-46.gh-issue-111356.Bc8LvA.rst b/Misc/NEWS.d/next/Library/2023-10-30-08-50-46.gh-issue-111356.Bc8LvA.rst
deleted file mode 100644
index a821b52b982175..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-30-08-50-46.gh-issue-111356.Bc8LvA.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added :func:`io.text_encoding()`, :data:`io.DEFAULT_BUFFER_SIZE`, and :class:`io.IncrementalNewlineDecoder` to ``io.__all__``.
diff --git a/Misc/NEWS.d/next/Library/2023-10-30-14-47-23.gh-issue-111246.QJ_ehs.rst b/Misc/NEWS.d/next/Library/2023-10-30-14-47-23.gh-issue-111246.QJ_ehs.rst
deleted file mode 100644
index a9630de5cc6947..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-30-14-47-23.gh-issue-111246.QJ_ehs.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-:meth:`asyncio.loop.create_unix_server` will now automatically remove the
-Unix socket when the server is closed.
diff --git a/Misc/NEWS.d/next/Library/2023-10-31-07-46-56.gh-issue-111531.6zUV_G.rst b/Misc/NEWS.d/next/Library/2023-10-31-07-46-56.gh-issue-111531.6zUV_G.rst
deleted file mode 100644
index b722f0414184b1..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-10-31-07-46-56.gh-issue-111531.6zUV_G.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix reference leaks in ``bind_class()`` and ``bind_all()`` methods of
-:mod:`tkinter` widgets.
diff --git a/Misc/NEWS.d/next/Library/2023-11-01-14-03-24.gh-issue-110894.7-wZxC.rst b/Misc/NEWS.d/next/Library/2023-11-01-14-03-24.gh-issue-110894.7-wZxC.rst
deleted file mode 100644
index c59fe6b9119eca..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-01-14-03-24.gh-issue-110894.7-wZxC.rst
+++ /dev/null
@@ -1 +0,0 @@
-Call loop exception handler for exceptions in ``client_connected_cb`` of :func:`asyncio.start_server` so that applications can handle it. Patch by Kumar Aditya.
diff --git a/Misc/NEWS.d/next/Library/2023-11-02-12-15-46.gh-issue-111482.FWqZIU.rst b/Misc/NEWS.d/next/Library/2023-11-02-12-15-46.gh-issue-111482.FWqZIU.rst
deleted file mode 100644
index d73e45ccf09b48..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-02-12-15-46.gh-issue-111482.FWqZIU.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:mod:`time`: Make :func:`time.clock_gettime()` and
-:func:`time.clock_gettime_ns()` functions up to 2x faster by faster calling
-convention. Patch by Victor Stinner.
diff --git a/Misc/NEWS.d/next/Library/2023-11-04-01-20-23.gh-issue-111719.fUiKBD.rst b/Misc/NEWS.d/next/Library/2023-11-04-01-20-23.gh-issue-111719.fUiKBD.rst
deleted file mode 100644
index 1d3b948644d232..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-04-01-20-23.gh-issue-111719.fUiKBD.rst
+++ /dev/null
@@ -1 +0,0 @@
-Add extra argument validation for ``alias`` command in :mod:`pdb`
diff --git a/Misc/NEWS.d/next/Library/2023-11-04-10-24-25.gh-issue-111541.x0RBI1.rst b/Misc/NEWS.d/next/Library/2023-11-04-10-24-25.gh-issue-111541.x0RBI1.rst
deleted file mode 100644
index 719b63dad36fb7..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-04-10-24-25.gh-issue-111541.x0RBI1.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix :mod:`doctest` for :exc:`SyntaxError` not-builtin subclasses.
diff --git a/Misc/NEWS.d/next/Library/2023-11-04-21-12-27.gh-issue-80731.Wq51xg.rst b/Misc/NEWS.d/next/Library/2023-11-04-21-12-27.gh-issue-80731.Wq51xg.rst
deleted file mode 100644
index 5f957a39b2e34b..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-04-21-12-27.gh-issue-80731.Wq51xg.rst
+++ /dev/null
@@ -1 +0,0 @@
-Avoid executing the default function in :class:`cmd.Cmd` in an except block
diff --git a/Misc/NEWS.d/next/Library/2023-11-08-07-42-53.gh-issue-111768.g-WpnV.rst b/Misc/NEWS.d/next/Library/2023-11-08-07-42-53.gh-issue-111768.g-WpnV.rst
deleted file mode 100644
index 501cfa3920a0bf..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-08-07-42-53.gh-issue-111768.g-WpnV.rst
+++ /dev/null
@@ -1 +0,0 @@
-:func:`wsgiref.util.is_hop_by_hop` is now exposed correctly in ``__all__``.
diff --git a/Misc/NEWS.d/next/Library/2023-11-08-11-50-49.gh-issue-111841.iSqdQf.rst b/Misc/NEWS.d/next/Library/2023-11-08-11-50-49.gh-issue-111841.iSqdQf.rst
deleted file mode 100644
index cd1780988aeac7..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-08-11-50-49.gh-issue-111841.iSqdQf.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix truncating arguments on an embedded null character in :meth:`os.putenv`
-and :meth:`os.unsetenv` on Windows.
diff --git a/Misc/NEWS.d/next/Library/2023-11-08-15-58-57.gh-issue-111804.uAXTOL.rst b/Misc/NEWS.d/next/Library/2023-11-08-15-58-57.gh-issue-111804.uAXTOL.rst
deleted file mode 100644
index 2696f2f492a8b0..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-08-15-58-57.gh-issue-111804.uAXTOL.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Remove posix.fallocate() under WASI as the underlying posix_fallocate() is
-not available in WASI preview2.
diff --git a/Misc/NEWS.d/next/Library/2023-11-08-23-32-03.gh-issue-111835.ufFiuW.rst b/Misc/NEWS.d/next/Library/2023-11-08-23-32-03.gh-issue-111835.ufFiuW.rst
deleted file mode 100644
index 5d06c22f477bab..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-08-23-32-03.gh-issue-111835.ufFiuW.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-The :class:`mmap.mmap` class now has an :meth:`~mmap.mmap.seekable` method
-that can be used where it requires a file-like object with seekable and
-the :meth:`~mmap.mmap.seek` method return the new absolute position.
-Patch by Donghee Na.
diff --git a/Misc/NEWS.d/next/Library/2023-11-09-10-45-56.gh-issue-103791.sdfkja.rst b/Misc/NEWS.d/next/Library/2023-11-09-10-45-56.gh-issue-103791.sdfkja.rst
deleted file mode 100644
index 5bfdd75ccc93e8..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-09-10-45-56.gh-issue-103791.sdfkja.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:class:`contextlib.suppress` now supports suppressing exceptions raised as
-part of a :exc:`BaseExceptionGroup`, in addition to the recent support for
-:exc:`ExceptionGroup`.
diff --git a/Misc/NEWS.d/next/Library/2023-11-09-12-57-43.gh-issue-111460.TQaz9I.rst b/Misc/NEWS.d/next/Library/2023-11-09-12-57-43.gh-issue-111460.TQaz9I.rst
deleted file mode 100644
index 956c536a291a9c..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-09-12-57-43.gh-issue-111460.TQaz9I.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-:mod:`curses`: restore wide character support (including
-:func:`curses.unget_wch` and :meth:`~curses.window.get_wch`) on macOS, which
-was unavailable due to a regression in Python 3.12.
diff --git a/Misc/NEWS.d/next/Library/2023-11-10-22-08-28.gh-issue-111942.MDFm6v.rst b/Misc/NEWS.d/next/Library/2023-11-10-22-08-28.gh-issue-111942.MDFm6v.rst
deleted file mode 100644
index 4fc505c8f257a6..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-10-22-08-28.gh-issue-111942.MDFm6v.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix crashes in :meth:`io.TextIOWrapper.reconfigure` when pass invalid
-arguments, e.g. non-string encoding.
diff --git a/Misc/NEWS.d/next/Library/2023-11-11-16-42-48.gh-issue-109538.cMG5ux.rst b/Misc/NEWS.d/next/Library/2023-11-11-16-42-48.gh-issue-109538.cMG5ux.rst
deleted file mode 100644
index d1ee4c054a3f19..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-11-16-42-48.gh-issue-109538.cMG5ux.rst
+++ /dev/null
@@ -1 +0,0 @@
-Issue warning message instead of having :class:`RuntimeError` be displayed when event loop has already been closed at :meth:`StreamWriter.__del__`.
diff --git a/Misc/NEWS.d/next/Library/2023-11-14-16-31-59.gh-issue-111995.OoX8JJ.rst b/Misc/NEWS.d/next/Library/2023-11-14-16-31-59.gh-issue-111995.OoX8JJ.rst
deleted file mode 100644
index 773f620c97b608..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-14-16-31-59.gh-issue-111995.OoX8JJ.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Added the ``NI_IDN`` constant to the :mod:`socket` module when present in C
-at build time for use with :func:`socket.getnameinfo`.
diff --git a/Misc/NEWS.d/next/Library/2023-11-14-18-43-55.gh-issue-111942.x1pnrj.rst b/Misc/NEWS.d/next/Library/2023-11-14-18-43-55.gh-issue-111942.x1pnrj.rst
deleted file mode 100644
index ca58a6fa5d6ae1..00000000000000
--- a/Misc/NEWS.d/next/Library/2023-11-14-18-43-55.gh-issue-111942.x1pnrj.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix SystemError in the TextIOWrapper constructor with non-encodable "errors"
-argument in non-debug mode.
diff --git a/Misc/NEWS.d/next/Tests/2023-09-15-15-00-14.gh-issue-108747.ql0owS.rst b/Misc/NEWS.d/next/Tests/2023-09-15-15-00-14.gh-issue-108747.ql0owS.rst
deleted file mode 100644
index ba1fe97871929c..00000000000000
--- a/Misc/NEWS.d/next/Tests/2023-09-15-15-00-14.gh-issue-108747.ql0owS.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Add unit test for ``usercustomize`` and ``sitecustomize`` hooks from
-:class:`site`.
diff --git a/Misc/NEWS.d/next/Tests/2023-10-16-13-47-24.gh-issue-110918.aFgZK3.rst b/Misc/NEWS.d/next/Tests/2023-10-16-13-47-24.gh-issue-110918.aFgZK3.rst
deleted file mode 100644
index 7cb79c0cbf29f1..00000000000000
--- a/Misc/NEWS.d/next/Tests/2023-10-16-13-47-24.gh-issue-110918.aFgZK3.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Test case matching patterns specified by options ``--match``, ``--ignore``,
-``--matchfile`` and ``--ignorefile`` are now tested in the order of
-specification, and the last match determines whether the test case be run or
-ignored.
diff --git a/Misc/NEWS.d/next/Tests/2023-10-17-17-54-36.gh-issue-110995.Fx8KRD.rst b/Misc/NEWS.d/next/Tests/2023-10-17-17-54-36.gh-issue-110995.Fx8KRD.rst
deleted file mode 100644
index db29eaf234b731..00000000000000
--- a/Misc/NEWS.d/next/Tests/2023-10-17-17-54-36.gh-issue-110995.Fx8KRD.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-test_gdb: Fix detection of gdb built without Python scripting support. Patch
-by Victor Stinner.
diff --git a/Misc/NEWS.d/next/Tests/2023-10-21-00-10-36.gh-issue-110932.jktjJU.rst b/Misc/NEWS.d/next/Tests/2023-10-21-00-10-36.gh-issue-110932.jktjJU.rst
deleted file mode 100644
index 45bb0774a9abe3..00000000000000
--- a/Misc/NEWS.d/next/Tests/2023-10-21-00-10-36.gh-issue-110932.jktjJU.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix regrtest if the ``SOURCE_DATE_EPOCH`` environment variable is defined:
-use the variable value as the random seed. Patch by Victor Stinner.
diff --git a/Misc/NEWS.d/next/Tests/2023-10-21-19-27-36.gh-issue-111165.FU6mUk.rst b/Misc/NEWS.d/next/Tests/2023-10-21-19-27-36.gh-issue-111165.FU6mUk.rst
deleted file mode 100644
index 11f302d943c29a..00000000000000
--- a/Misc/NEWS.d/next/Tests/2023-10-21-19-27-36.gh-issue-111165.FU6mUk.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Remove no longer used functions ``run_unittest()`` and ``run_doctest()``
-from the :mod:`test.support` module.
diff --git a/Misc/NEWS.d/next/Tests/2023-10-31-22-09-25.gh-issue-110367.UhQi44.rst b/Misc/NEWS.d/next/Tests/2023-10-31-22-09-25.gh-issue-110367.UhQi44.rst
deleted file mode 100644
index 0254288d3626cc..00000000000000
--- a/Misc/NEWS.d/next/Tests/2023-10-31-22-09-25.gh-issue-110367.UhQi44.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Make regrtest ``--verbose3`` option compatible with ``--huntrleaks -jN``
-options. The ``./python -m test -j1 -R 3:3 --verbose3`` command now works as
-expected. Patch by Victor Stinner.
diff --git a/Misc/NEWS.d/next/Tests/2023-11-03-18-59-13.gh-issue-110722.jvT1pb.rst b/Misc/NEWS.d/next/Tests/2023-11-03-18-59-13.gh-issue-110722.jvT1pb.rst
deleted file mode 100644
index ad1ac536a092ea..00000000000000
--- a/Misc/NEWS.d/next/Tests/2023-11-03-18-59-13.gh-issue-110722.jvT1pb.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Gathering line coverage of standard libraries within the regression test
-suite is now precise, as well as much faster. Patch by Łukasz Langa.
diff --git a/Misc/NEWS.d/next/Tests/2023-11-17-15-20-41.gh-issue-111808.jtIayt.rst b/Misc/NEWS.d/next/Tests/2023-11-17-15-20-41.gh-issue-111808.jtIayt.rst
deleted file mode 100644
index 36151d4b0adf03..00000000000000
--- a/Misc/NEWS.d/next/Tests/2023-11-17-15-20-41.gh-issue-111808.jtIayt.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Make the default value of ``test.support.infinite_recursion()`` to be
-conditional based on whether optimizations were used when compiling the
-interpreter. This helps with platforms like WASI whose stack size is greatly
-restricted in debug builds.
diff --git a/Misc/NEWS.d/next/Tools-Demos/2023-11-09-13-04-29.gh-issue-111903.7Prryr.rst b/Misc/NEWS.d/next/Tools-Demos/2023-11-09-13-04-29.gh-issue-111903.7Prryr.rst
deleted file mode 100644
index 41601f7511797a..00000000000000
--- a/Misc/NEWS.d/next/Tools-Demos/2023-11-09-13-04-29.gh-issue-111903.7Prryr.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Argument Clinic now supports the ``@critical_section`` directive that
-instructs Argument Clinic to generate a critical section around the function
-call, which locks the ``self`` object in ``--disable-gil`` builds. Patch by
-Sam Gross.
diff --git a/Misc/NEWS.d/next/Windows/2023-10-19-21-46-18.gh-issue-110913.CWlPfg.rst b/Misc/NEWS.d/next/Windows/2023-10-19-21-46-18.gh-issue-110913.CWlPfg.rst
deleted file mode 100644
index d4c1b56d98ef0e..00000000000000
--- a/Misc/NEWS.d/next/Windows/2023-10-19-21-46-18.gh-issue-110913.CWlPfg.rst
+++ /dev/null
@@ -1 +0,0 @@
-WindowsConsoleIO now correctly chunks large buffers without splitting up UTF-8 sequences.
diff --git a/Misc/NEWS.d/next/Windows/2023-10-25-05-01-28.gh-issue-111293.FSsLT6.rst b/Misc/NEWS.d/next/Windows/2023-10-25-05-01-28.gh-issue-111293.FSsLT6.rst
deleted file mode 100644
index 4c6b255bc44c7b..00000000000000
--- a/Misc/NEWS.d/next/Windows/2023-10-25-05-01-28.gh-issue-111293.FSsLT6.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fix :data:`os.DirEntry.inode` dropping higher 64 bits of a file id on some filesystems on Windows.
diff --git a/Misc/NEWS.d/next/Windows/2023-11-13-22-35-27.gh-issue-111856.vEtA5z.rst b/Misc/NEWS.d/next/Windows/2023-11-13-22-35-27.gh-issue-111856.vEtA5z.rst
deleted file mode 100644
index b1388df8e4c479..00000000000000
--- a/Misc/NEWS.d/next/Windows/2023-11-13-22-35-27.gh-issue-111856.vEtA5z.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Fixes :func:`~os.fstat` on file systems that do not support file ID
-requests. This includes FAT32 and exFAT.
diff --git a/Misc/NEWS.d/next/macOS/2023-08-30-16-33-57.gh-issue-92603.ATkKVO.rst b/Misc/NEWS.d/next/macOS/2023-08-30-16-33-57.gh-issue-92603.ATkKVO.rst
deleted file mode 100644
index 477463c0c21264..00000000000000
--- a/Misc/NEWS.d/next/macOS/2023-08-30-16-33-57.gh-issue-92603.ATkKVO.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Update macOS installer to include a fix accepted by upstream Tcl/Tk
-for a crash encountered after the first :meth:`tkinter.Tk` instance
-is destroyed.
diff --git a/Misc/NEWS.d/next/macOS/2023-09-02-08-49-57.gh-issue-71383.Ttkchg.rst b/Misc/NEWS.d/next/macOS/2023-09-02-08-49-57.gh-issue-71383.Ttkchg.rst
deleted file mode 100644
index d8f3e429aab815..00000000000000
--- a/Misc/NEWS.d/next/macOS/2023-09-02-08-49-57.gh-issue-71383.Ttkchg.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Update macOS installer to include an upstream Tcl/Tk fix
-for the ``ttk::ThemeChanged`` error encountered in Tkinter.
diff --git a/Misc/NEWS.d/next/macOS/2023-10-18-01-40-36.gh-issue-111015.NaLI2L.rst b/Misc/NEWS.d/next/macOS/2023-10-18-01-40-36.gh-issue-111015.NaLI2L.rst
deleted file mode 100644
index 4c6eea136554c8..00000000000000
--- a/Misc/NEWS.d/next/macOS/2023-10-18-01-40-36.gh-issue-111015.NaLI2L.rst
+++ /dev/null
@@ -1 +0,0 @@
-Ensure that IDLE.app and Python Launcher.app are installed with appropriate permissions on macOS builds.
diff --git a/Misc/NEWS.d/next/macOS/2023-10-18-17-26-36.gh-issue-110950.sonoma.rst b/Misc/NEWS.d/next/macOS/2023-10-18-17-26-36.gh-issue-110950.sonoma.rst
deleted file mode 100644
index c678c09f6aa55b..00000000000000
--- a/Misc/NEWS.d/next/macOS/2023-10-18-17-26-36.gh-issue-110950.sonoma.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Update macOS installer to include an upstream Tcl/Tk fix for the
-``Secure coding is not enabled for restorable state!`` warning
-encountered in Tkinter on macOS 14 Sonoma.
diff --git a/Misc/NEWS.d/next/macOS/2023-10-31-22-13-05.gh-issue-59703.SML6Ag.rst b/Misc/NEWS.d/next/macOS/2023-10-31-22-13-05.gh-issue-59703.SML6Ag.rst
deleted file mode 100644
index eeb014dd92ba36..00000000000000
--- a/Misc/NEWS.d/next/macOS/2023-10-31-22-13-05.gh-issue-59703.SML6Ag.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-For macOS framework builds, in ``getpath.c`` use the system ``dladdr``
-function to find the path to the shared library rather than depending
-on deprecated macOS APIs.
-
diff --git a/README.rst b/README.rst
index 9ba06f76ba5da8..4c8602c97ac8ef 100644
--- a/README.rst
+++ b/README.rst
@@ -1,4 +1,4 @@
-This is Python version 3.13.0 alpha 1
+This is Python version 3.13.0 alpha 2
 =====================================
 
 .. image:: https://github.com/python/cpython/workflows/Tests/badge.svg

From 1c5279b9d63ab5b8562c42cad18b042aab931758 Mon Sep 17 00:00:00 2001
From: Thomas Wouters <thomas@python.org>
Date: Wed, 22 Nov 2023 22:24:48 +0100
Subject: [PATCH 02/18] Post 3.13.0a2

---
 Include/patchlevel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 592491eed5ff84..fad79ecfda7b28 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,7 +23,7 @@
 #define PY_RELEASE_SERIAL       2
 
 /* Version as a string */
-#define PY_VERSION              "3.13.0a2"
+#define PY_VERSION              "3.13.0a2+"
 /*--end constants--*/
 
 /* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.

From 5c3a129ecfbaac107bccf3083533276ee0ccc036 Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 22 Nov 2023 14:48:45 -0700
Subject: [PATCH 03/18] gh-76785: Clean up the Failure-Related
 _xxsubinterpreters Tests (gh-112322)

---
 Lib/test/test__xxsubinterpreters.py | 194 ++++++++++++++++++++++------
 1 file changed, 157 insertions(+), 37 deletions(-)

diff --git a/Lib/test/test__xxsubinterpreters.py b/Lib/test/test__xxsubinterpreters.py
index 97314ddbb55ec8..d2056c9f52287b 100644
--- a/Lib/test/test__xxsubinterpreters.py
+++ b/Lib/test/test__xxsubinterpreters.py
@@ -10,6 +10,7 @@
 import _testinternalcapi
 from test import support
 from test.support import import_helper
+from test.support import os_helper
 from test.support import script_helper
 
 
@@ -759,43 +760,6 @@ def test_bytes_for_script(self):
         with self.assertRaises(TypeError):
             interpreters.run_string(self.id, b'print("spam")')
 
-    @contextlib.contextmanager
-    def assert_run_failed(self, exctype, msg=None):
-        with self.assertRaises(interpreters.RunFailedError) as caught:
-            yield
-        if msg is None:
-            self.assertEqual(str(caught.exception).split(':')[0],
-                             exctype.__name__)
-        else:
-            self.assertEqual(str(caught.exception),
-                             "{}: {}".format(exctype.__name__, msg))
-
-    def test_invalid_syntax(self):
-        with self.assert_run_failed(SyntaxError):
-            # missing close paren
-            interpreters.run_string(self.id, 'print("spam"')
-
-    def test_failure(self):
-        with self.assert_run_failed(Exception, 'spam'):
-            interpreters.run_string(self.id, 'raise Exception("spam")')
-
-    def test_SystemExit(self):
-        with self.assert_run_failed(SystemExit, '42'):
-            interpreters.run_string(self.id, 'raise SystemExit(42)')
-
-    def test_sys_exit(self):
-        with self.assert_run_failed(SystemExit):
-            interpreters.run_string(self.id, dedent("""
-                import sys
-                sys.exit()
-                """))
-
-        with self.assert_run_failed(SystemExit, '42'):
-            interpreters.run_string(self.id, dedent("""
-                import sys
-                sys.exit(42)
-                """))
-
     def test_with_shared(self):
         r, w = os.pipe()
 
@@ -959,6 +923,162 @@ def f():
         self.assertEqual(retcode, 0)
 
 
+class RunFailedTests(TestBase):
+
+    def setUp(self):
+        super().setUp()
+        self.id = interpreters.create()
+
+    def add_module(self, modname, text):
+        import tempfile
+        tempdir = tempfile.mkdtemp()
+        self.addCleanup(lambda: os_helper.rmtree(tempdir))
+        interpreters.run_string(self.id, dedent(f"""
+            import sys
+            sys.path.insert(0, {tempdir!r})
+            """))
+        return script_helper.make_script(tempdir, modname, text)
+
+    def run_script(self, text, *, fails=False):
+        excwrapper = interpreters.RunFailedError
+        r, w = os.pipe()
+        try:
+            script = dedent(f"""
+                import os, sys
+                os.write({w}, b'0')
+
+                # This raises an exception:
+                {{}}
+
+                # Nothing from here down should ever run.
+                os.write({w}, b'1')
+                class NeverError(Exception): pass
+                raise NeverError  # never raised
+                """).format(dedent(text))
+            if fails:
+                with self.assertRaises(excwrapper) as caught:
+                    interpreters.run_string(self.id, script)
+                return caught.exception
+            else:
+                interpreters.run_string(self.id, script)
+                return None
+        except:
+            raise  # re-raise
+        else:
+            msg = os.read(r, 100)
+            self.assertEqual(msg, b'0')
+        finally:
+            os.close(r)
+            os.close(w)
+
+    def _assert_run_failed(self, exctype, msg, script):
+        if isinstance(exctype, str):
+            exctype_name = exctype
+            exctype = None
+        else:
+            exctype_name = exctype.__name__
+
+        # Run the script.
+        exc = self.run_script(script, fails=True)
+
+        # Check the wrapper exception.
+        if msg is None:
+            self.assertEqual(str(exc).split(':')[0],
+                             exctype_name)
+        else:
+            self.assertEqual(str(exc),
+                             '{}: {}'.format(exctype_name, msg))
+
+        return exc
+
+    def assert_run_failed(self, exctype, script):
+        self._assert_run_failed(exctype, None, script)
+
+    def assert_run_failed_msg(self, exctype, msg, script):
+        self._assert_run_failed(exctype, msg, script)
+
+    def test_exit(self):
+        with self.subTest('sys.exit(0)'):
+            # XXX Should an unhandled SystemExit(0) be handled as not-an-error?
+            self.assert_run_failed(SystemExit, """
+                sys.exit(0)
+                """)
+
+        with self.subTest('sys.exit()'):
+            self.assert_run_failed(SystemExit, """
+                import sys
+                sys.exit()
+                """)
+
+        with self.subTest('sys.exit(42)'):
+            self.assert_run_failed_msg(SystemExit, '42', """
+                import sys
+                sys.exit(42)
+                """)
+
+        with self.subTest('SystemExit'):
+            self.assert_run_failed_msg(SystemExit, '42', """
+                raise SystemExit(42)
+                """)
+
+        # XXX Also check os._exit() (via a subprocess)?
+
+    def test_plain_exception(self):
+        self.assert_run_failed_msg(Exception, 'spam', """
+            raise Exception("spam")
+            """)
+
+    def test_invalid_syntax(self):
+        script = dedent("""
+            x = 1 + 2
+            y = 2 + 4
+            z = 4 + 8
+
+            # missing close paren
+            print("spam"
+
+            if x + y + z < 20:
+                ...
+            """)
+
+        with self.subTest('script'):
+            self.assert_run_failed(SyntaxError, script)
+
+        with self.subTest('module'):
+            modname = 'spam_spam_spam'
+            filename = self.add_module(modname, script)
+            self.assert_run_failed(SyntaxError, f"""
+                import {modname}
+                """)
+
+    def test_NameError(self):
+        self.assert_run_failed(NameError, """
+            res = spam + eggs
+            """)
+        # XXX check preserved suggestions
+
+    def test_AttributeError(self):
+        self.assert_run_failed(AttributeError, """
+            object().spam
+            """)
+        # XXX check preserved suggestions
+
+    def test_ExceptionGroup(self):
+        self.assert_run_failed(ExceptionGroup, """
+            raise ExceptionGroup('exceptions', [
+                Exception('spam'),
+                ImportError('eggs'),
+            ])
+            """)
+
+    def test_user_defined_exception(self):
+        self.assert_run_failed_msg('MyError', 'spam', """
+            class MyError(Exception):
+                pass
+            raise MyError('spam')
+            """)
+
+
 class RunFuncTests(TestBase):
 
     def setUp(self):

From 790db85c7737c2ebbb145f9a26f675a586c5f0d1 Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 22 Nov 2023 15:03:33 -0700
Subject: [PATCH 04/18] gh-76785: Add _PyType_GetModuleName() to the Internal
 C-API (gh-112323)

The new function corresponds to the existing (public) PyType_GetName() and PyType_GetQualName().
---
 Include/internal/pycore_typeobject.h |  5 +++++
 Lib/test/test_capi/test_misc.py      | 15 +++++++++++++++
 Modules/_testcapimodule.c            |  7 +++++++
 Modules/_testinternalcapi.c          | 10 ++++++++++
 Objects/typeobject.c                 |  6 ++++++
 5 files changed, 43 insertions(+)

diff --git a/Include/internal/pycore_typeobject.h b/Include/internal/pycore_typeobject.h
index 27c6c8731cb3f9..bbf8544b09f0fb 100644
--- a/Include/internal/pycore_typeobject.h
+++ b/Include/internal/pycore_typeobject.h
@@ -143,6 +143,11 @@ extern PyTypeObject _PyBufferWrapper_Type;
 extern PyObject* _PySuper_Lookup(PyTypeObject *su_type, PyObject *su_obj,
                                  PyObject *name, int *meth_found);
 
+
+// This is exported for the _testinternalcapi module.
+PyAPI_FUNC(PyObject *) _PyType_GetModuleName(PyTypeObject *);
+
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py
index 21a5cd3326d707..6cbf5d22203804 100644
--- a/Lib/test/test_capi/test_misc.py
+++ b/Lib/test/test_capi/test_misc.py
@@ -1098,6 +1098,21 @@ class Data(_testcapi.ObjExtraData):
         del d.extra
         self.assertIsNone(d.extra)
 
+    def test_get_type_module_name(self):
+        from collections import OrderedDict
+        ht = _testcapi.get_heaptype_for_name()
+        for cls, expected in {
+            int: 'builtins',
+            OrderedDict: 'collections',
+            ht: '_testcapi',
+        }.items():
+            with self.subTest(repr(cls)):
+                modname = _testinternalcapi.get_type_module_name(cls)
+                self.assertEqual(modname, expected)
+
+        ht.__module__ = 'test_module'
+        modname = _testinternalcapi.get_type_module_name(ht)
+        self.assertEqual(modname, 'test_module')
 
 @requires_limited_api
 class TestHeapTypeRelative(unittest.TestCase):
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c
index 999bd866f14814..9fdd67093338e4 100644
--- a/Modules/_testcapimodule.c
+++ b/Modules/_testcapimodule.c
@@ -569,6 +569,12 @@ static PyType_Spec HeapTypeNameType_Spec = {
     .slots = HeapTypeNameType_slots,
 };
 
+static PyObject *
+get_heaptype_for_name(PyObject *self, PyObject *Py_UNUSED(ignored))
+{
+    return PyType_FromSpec(&HeapTypeNameType_Spec);
+}
+
 static PyObject *
 test_get_type_name(PyObject *self, PyObject *Py_UNUSED(ignored))
 {
@@ -3210,6 +3216,7 @@ static PyMethodDef TestMethods[] = {
     {"py_buildvalue_ints",       py_buildvalue_ints,             METH_VARARGS},
     {"test_buildvalue_N",        test_buildvalue_N,              METH_NOARGS},
     {"test_get_statictype_slots", test_get_statictype_slots,     METH_NOARGS},
+    {"get_heaptype_for_name",     get_heaptype_for_name,         METH_NOARGS},
     {"test_get_type_name",        test_get_type_name,            METH_NOARGS},
     {"test_get_type_qualname",    test_get_type_qualname,        METH_NOARGS},
     {"test_get_type_dict",        test_get_type_dict,            METH_NOARGS},
diff --git a/Modules/_testinternalcapi.c b/Modules/_testinternalcapi.c
index 4fc9e853c0cd91..4607a3faf17f74 100644
--- a/Modules/_testinternalcapi.c
+++ b/Modules/_testinternalcapi.c
@@ -27,6 +27,7 @@
 #include "pycore_pathconfig.h"    // _PyPathConfig_ClearGlobal()
 #include "pycore_pyerrors.h"      // _PyErr_ChainExceptions1()
 #include "pycore_pystate.h"       // _PyThreadState_GET()
+#include "pycore_typeobject.h"    // _PyType_GetModuleName()
 
 #include "interpreteridobject.h"  // PyInterpreterID_LookUp()
 
@@ -1616,6 +1617,14 @@ perf_trampoline_set_persist_after_fork(PyObject *self, PyObject *args)
 }
 
 
+static PyObject *
+get_type_module_name(PyObject *self, PyObject *type)
+{
+    assert(PyType_Check(type));
+    return _PyType_GetModuleName((PyTypeObject *)type);
+}
+
+
 static PyMethodDef module_functions[] = {
     {"get_configs", get_configs, METH_NOARGS},
     {"get_recursion_depth", get_recursion_depth, METH_NOARGS},
@@ -1678,6 +1687,7 @@ static PyMethodDef module_functions[] = {
     {"get_crossinterp_data",    get_crossinterp_data,            METH_VARARGS},
     {"restore_crossinterp_data", restore_crossinterp_data,       METH_VARARGS},
     _TESTINTERNALCAPI_TEST_LONG_NUMBITS_METHODDEF
+    {"get_type_module_name",    get_type_module_name,            METH_O},
     {NULL, NULL} /* sentinel */
 };
 
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index f5975a3cd90cb4..aa00e04ad5e11b 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -4540,6 +4540,12 @@ PyType_GetQualName(PyTypeObject *type)
     return type_qualname(type, NULL);
 }
 
+PyObject *
+_PyType_GetModuleName(PyTypeObject *type)
+{
+    return type_module(type, NULL);
+}
+
 void *
 PyType_GetSlot(PyTypeObject *type, int slot)
 {

From 10e1a0c91613908757a5b97602834defbe575ab0 Mon Sep 17 00:00:00 2001
From: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Date: Wed, 22 Nov 2023 22:36:55 +0000
Subject: [PATCH 05/18] gh-112137: change dis output to display labels instead
 of offsets (#112138)

---
 Doc/library/dis.rst                           |   36 +-
 Doc/whatsnew/3.13.rst                         |    9 +
 Lib/dis.py                                    |  156 +-
 Lib/test/test_dis.py                          | 1451 ++++++++---------
 ...-11-16-17-18-09.gh-issue-112137.QvjGjN.rst |    1 +
 5 files changed, 838 insertions(+), 815 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2023-11-16-17-18-09.gh-issue-112137.QvjGjN.rst

diff --git a/Doc/library/dis.rst b/Doc/library/dis.rst
index e44fa46b5d4145..7e97f1a4524554 100644
--- a/Doc/library/dis.rst
+++ b/Doc/library/dis.rst
@@ -51,6 +51,11 @@ interpreter.
       transparent for forward jumps but needs to be taken into account when
       reasoning about backward jumps.
 
+   .. versionchanged:: 3.13
+      The output shows logical labels rather than instruction offsets
+      for jump targets and exception handlers. The ``-O`` command line
+      option and the ``show_offsets`` argument were added.
+
 Example: Given the function :func:`!myfunc`::
 
    def myfunc(alist):
@@ -62,12 +67,12 @@ the following command can be used to display the disassembly of
 .. doctest::
 
    >>> dis.dis(myfunc)
-     2           0 RESUME                   0
+     2           RESUME                   0
    <BLANKLINE>
-     3           2 LOAD_GLOBAL              1 (len + NULL)
-                12 LOAD_FAST                0 (alist)
-                14 CALL                     1
-                22 RETURN_VALUE
+     3           LOAD_GLOBAL              1 (len + NULL)
+                 LOAD_FAST                0 (alist)
+                 CALL                     1
+                 RETURN_VALUE
 
 (The "2" is a line number).
 
@@ -80,7 +85,7 @@ The :mod:`dis` module can be invoked as a script from the command line:
 
 .. code-block:: sh
 
-   python -m dis [-h] [-C] [infile]
+   python -m dis [-h] [-C] [-O] [infile]
 
 The following options are accepted:
 
@@ -94,6 +99,10 @@ The following options are accepted:
 
    Show inline caches.
 
+.. cmdoption:: -O, --show-offsets
+
+   Show offsets of instructions.
+
 If :file:`infile` is specified, its disassembled code will be written to stdout.
 Otherwise, disassembly is performed on compiled source code recieved from stdin.
 
@@ -107,7 +116,7 @@ The bytecode analysis API allows pieces of Python code to be wrapped in a
 code.
 
 .. class:: Bytecode(x, *, first_line=None, current_offset=None,\
-                    show_caches=False, adaptive=False)
+                    show_caches=False, adaptive=False, show_offsets=False)
 
    Analyse the bytecode corresponding to a function, generator, asynchronous
    generator, coroutine, method, string of source code, or a code object (as
@@ -132,6 +141,9 @@ code.
    If *adaptive* is ``True``, :meth:`.dis` will display specialized bytecode
    that may be different from the original bytecode.
 
+   If *show_offsets* is ``True``, :meth:`.dis` will include instruction
+   offsets in the output.
+
    .. classmethod:: from_traceback(tb, *, show_caches=False)
 
       Construct a :class:`Bytecode` instance from the given traceback, setting
@@ -254,7 +266,8 @@ operation is being performed, so the intermediate analysis object isn't useful:
       Added the *show_caches* and *adaptive* parameters.
 
 
-.. function:: distb(tb=None, *, file=None, show_caches=False, adaptive=False)
+.. function:: distb(tb=None, *, file=None, show_caches=False, adaptive=False,
+                    show_offset=False)
 
    Disassemble the top-of-stack function of a traceback, using the last
    traceback if none was passed.  The instruction causing the exception is
@@ -269,9 +282,12 @@ operation is being performed, so the intermediate analysis object isn't useful:
    .. versionchanged:: 3.11
       Added the *show_caches* and *adaptive* parameters.
 
+   .. versionchanged:: 3.13
+      Added the *show_offsets* parameter.
 
 .. function:: disassemble(code, lasti=-1, *, file=None, show_caches=False, adaptive=False)
-              disco(code, lasti=-1, *, file=None, show_caches=False, adaptive=False)
+              disco(code, lasti=-1, *, file=None, show_caches=False, adaptive=False,
+              show_offsets=False)
 
    Disassemble a code object, indicating the last instruction if *lasti* was
    provided.  The output is divided in the following columns:
@@ -296,6 +312,8 @@ operation is being performed, so the intermediate analysis object isn't useful:
    .. versionchanged:: 3.11
       Added the *show_caches* and *adaptive* parameters.
 
+   .. versionchanged:: 3.13
+      Added the *show_offsets* parameter.
 
 .. function:: get_instructions(x, *, first_line=None, show_caches=False, adaptive=False)
 
diff --git a/Doc/whatsnew/3.13.rst b/Doc/whatsnew/3.13.rst
index fc5ae13abe7961..3fd0f5e165f018 100644
--- a/Doc/whatsnew/3.13.rst
+++ b/Doc/whatsnew/3.13.rst
@@ -168,6 +168,15 @@ copy
   any user classes which define the :meth:`!__replace__` method.
   (Contributed by Serhiy Storchaka in :gh:`108751`.)
 
+dis
+---
+
+* Change the output of :mod:`dis` module functions to show logical
+  labels for jump targets and exception handlers, rather than offsets.
+  The offsets can be added with the new ``-O`` command line option or
+  the ``show_offsets`` parameter.
+  (Contributed by Irit Katriel in :gh:`112137`.)
+
 dbm
 ---
 
diff --git a/Lib/dis.py b/Lib/dis.py
index 965a0268635ebc..c05b8e0dd8617a 100644
--- a/Lib/dis.py
+++ b/Lib/dis.py
@@ -72,7 +72,8 @@ def _try_compile(source, name):
         pass
     return compile(source, name, 'exec')
 
-def dis(x=None, *, file=None, depth=None, show_caches=False, adaptive=False):
+def dis(x=None, *, file=None, depth=None, show_caches=False, adaptive=False,
+        show_offsets=False):
     """Disassemble classes, methods, functions, and other compiled objects.
 
     With no argument, disassemble the last traceback.
@@ -82,7 +83,8 @@ def dis(x=None, *, file=None, depth=None, show_caches=False, adaptive=False):
     in a special attribute.
     """
     if x is None:
-        distb(file=file, show_caches=show_caches, adaptive=adaptive)
+        distb(file=file, show_caches=show_caches, adaptive=adaptive,
+              show_offsets=show_offsets)
         return
     # Extract functions from methods.
     if hasattr(x, '__func__'):
@@ -103,21 +105,21 @@ def dis(x=None, *, file=None, depth=None, show_caches=False, adaptive=False):
             if isinstance(x1, _have_code):
                 print("Disassembly of %s:" % name, file=file)
                 try:
-                    dis(x1, file=file, depth=depth, show_caches=show_caches, adaptive=adaptive)
+                    dis(x1, file=file, depth=depth, show_caches=show_caches, adaptive=adaptive, show_offsets=show_offsets)
                 except TypeError as msg:
                     print("Sorry:", msg, file=file)
                 print(file=file)
     elif hasattr(x, 'co_code'): # Code object
-        _disassemble_recursive(x, file=file, depth=depth, show_caches=show_caches, adaptive=adaptive)
+        _disassemble_recursive(x, file=file, depth=depth, show_caches=show_caches, adaptive=adaptive, show_offsets=show_offsets)
     elif isinstance(x, (bytes, bytearray)): # Raw bytecode
-        _disassemble_bytes(x, file=file, show_caches=show_caches)
+        _disassemble_bytes(x, file=file, show_caches=show_caches, show_offsets=show_offsets)
     elif isinstance(x, str):    # Source code
-        _disassemble_str(x, file=file, depth=depth, show_caches=show_caches, adaptive=adaptive)
+        _disassemble_str(x, file=file, depth=depth, show_caches=show_caches, adaptive=adaptive, show_offsets=show_offsets)
     else:
         raise TypeError("don't know how to disassemble %s objects" %
                         type(x).__name__)
 
-def distb(tb=None, *, file=None, show_caches=False, adaptive=False):
+def distb(tb=None, *, file=None, show_caches=False, adaptive=False, show_offsets=False):
     """Disassemble a traceback (default: last traceback)."""
     if tb is None:
         try:
@@ -128,7 +130,7 @@ def distb(tb=None, *, file=None, show_caches=False, adaptive=False):
         except AttributeError:
             raise RuntimeError("no last traceback to disassemble") from None
         while tb.tb_next: tb = tb.tb_next
-    disassemble(tb.tb_frame.f_code, tb.tb_lasti, file=file, show_caches=show_caches, adaptive=adaptive)
+    disassemble(tb.tb_frame.f_code, tb.tb_lasti, file=file, show_caches=show_caches, adaptive=adaptive, show_offsets=show_offsets)
 
 # The inspect module interrogates this dictionary to build its
 # list of CO_* constants. It is also used by pretty_flags to
@@ -263,10 +265,10 @@ def show_code(co, *, file=None):
         'start_offset',
         'starts_line',
         'line_number',
-        'is_jump_target',
+        'label',
         'positions'
     ],
-    defaults=[None]
+    defaults=[None, None]
 )
 
 _Instruction.opname.__doc__ = "Human readable name for operation"
@@ -281,12 +283,15 @@ def show_code(co, *, file=None):
 )
 _Instruction.starts_line.__doc__ = "True if this opcode starts a source line, otherwise False"
 _Instruction.line_number.__doc__ = "source line number associated with this opcode (if any), otherwise None"
-_Instruction.is_jump_target.__doc__ = "True if other code jumps to here, otherwise False"
+_Instruction.label.__doc__ = "A label (int > 0) if this instruction is a jump target, otherwise None"
 _Instruction.positions.__doc__ = "dis.Positions object holding the span of source code covered by this instruction"
 
-_ExceptionTableEntry = collections.namedtuple("_ExceptionTableEntry",
+_ExceptionTableEntryBase = collections.namedtuple("_ExceptionTableEntryBase",
     "start end target depth lasti")
 
+class _ExceptionTableEntry(_ExceptionTableEntryBase):
+    pass
+
 _OPNAME_WIDTH = 20
 _OPARG_WIDTH = 5
 
@@ -325,13 +330,14 @@ class Instruction(_Instruction):
                         otherwise equal to Instruction.offset
          starts_line - True if this opcode starts a source line, otherwise False
          line_number - source line number associated with this opcode (if any), otherwise None
-         is_jump_target - True if other code jumps to here, otherwise False
+         label - A label if this instruction is a jump target, otherwise None
          positions - Optional dis.Positions object holding the span of source code
                      covered by this instruction
     """
 
     @staticmethod
-    def _get_argval_argrepr(op, arg, offset, co_consts, names, varname_from_oparg):
+    def _get_argval_argrepr(op, arg, offset, co_consts, names, varname_from_oparg,
+                            labels_map):
         get_name = None if names is None else names.__getitem__
         argval = None
         argrepr = ''
@@ -361,13 +367,13 @@ def _get_argval_argrepr(op, arg, offset, co_consts, names, varname_from_oparg):
                     argval, argrepr = _get_name_info(arg, get_name)
             elif deop in hasjabs:
                 argval = arg*2
-                argrepr = "to " + repr(argval)
+                argrepr = f"to L{labels_map[argval]}"
             elif deop in hasjrel:
                 signed_arg = -arg if _is_backward_jump(deop) else arg
                 argval = offset + 2 + signed_arg*2
                 caches = _get_cache_size(_all_opname[deop])
                 argval += 2 * caches
-                argrepr = "to " + repr(argval)
+                argrepr = f"to L{labels_map[argval]}"
             elif deop in (LOAD_FAST_LOAD_FAST, STORE_FAST_LOAD_FAST, STORE_FAST_STORE_FAST):
                 arg1 = arg >> 4
                 arg2 = arg & 15
@@ -399,14 +405,21 @@ def _get_argval_argrepr(op, arg, offset, co_consts, names, varname_from_oparg):
 
     @classmethod
     def _create(cls, op, arg, offset, start_offset, starts_line, line_number,
-               is_jump_target, positions,
-               co_consts=None, varname_from_oparg=None, names=None):
+               positions,
+               co_consts=None, varname_from_oparg=None, names=None,
+               labels_map=None, exceptions_map=None):
+
+        label_width = 4 + len(str(len(labels_map)))
         argval, argrepr = cls._get_argval_argrepr(
                                op, arg, offset,
-                               co_consts, names, varname_from_oparg)
-        return Instruction(_all_opname[op], op, arg, argval, argrepr,
-                           offset, start_offset, starts_line, line_number,
-                           is_jump_target, positions)
+                               co_consts, names, varname_from_oparg, labels_map)
+        label = labels_map.get(offset, None)
+        instr = Instruction(_all_opname[op], op, arg, argval, argrepr,
+                            offset, start_offset, starts_line, line_number,
+                            label, positions)
+        instr.label_width = label_width
+        instr.exc_handler = exceptions_map.get(offset, None)
+        return instr
 
     @property
     def oparg(self):
@@ -447,7 +460,12 @@ def jump_target(self):
         """
         return _get_jump_target(self.opcode, self.arg, self.offset)
 
-    def _disassemble(self, lineno_width=3, mark_as_current=False, offset_width=4):
+    @property
+    def is_jump_target(self):
+        """True if other code jumps to here, otherwise False"""
+        return self.label is not None
+
+    def _disassemble(self, lineno_width=3, mark_as_current=False, offset_width=0):
         """Format instruction details for inclusion in disassembly output.
 
         *lineno_width* sets the width of the line number field (0 omits it)
@@ -463,18 +481,20 @@ def _disassemble(self, lineno_width=3, mark_as_current=False, offset_width=4):
                 fields.append(lineno_fmt % self.line_number)
             else:
                 fields.append(' ' * lineno_width)
+        # Column: Label
+        if self.label is not None:
+            lbl = f"L{self.label}:"
+            fields.append(f"{lbl:>{self.label_width}}")
+        else:
+            fields.append(' ' * self.label_width)
+        # Column: Instruction offset from start of code sequence
+        if offset_width > 0:
+            fields.append(f"{repr(self.offset):>{offset_width}}  ")
         # Column: Current instruction indicator
         if mark_as_current:
             fields.append('-->')
         else:
             fields.append('   ')
-        # Column: Jump target marker
-        if self.is_jump_target:
-            fields.append('>>')
-        else:
-            fields.append('  ')
-        # Column: Instruction offset from start of code sequence
-        fields.append(repr(self.offset).rjust(offset_width))
         # Column: Opcode name
         fields.append(self.opname.ljust(_OPNAME_WIDTH))
         # Column: Opcode argument
@@ -605,10 +625,29 @@ def _get_instructions_bytes(code, varname_from_oparg=None,
     original_code = original_code or code
     co_positions = co_positions or iter(())
     get_name = None if names is None else names.__getitem__
-    labels = set(findlabels(original_code))
-    for start, end, target, _, _ in exception_entries:
-        for i in range(start, end):
+
+    def make_labels_map(original_code, exception_entries):
+        jump_targets = set(findlabels(original_code))
+        labels = set(jump_targets)
+        for start, end, target, _, _ in exception_entries:
+            labels.add(start)
+            labels.add(end)
             labels.add(target)
+        labels = sorted(labels)
+        labels_map = {offset: i+1 for (i, offset) in enumerate(sorted(labels))}
+        for e in exception_entries:
+            e.start_label = labels_map[e.start]
+            e.end_label = labels_map[e.end]
+            e.target_label = labels_map[e.target]
+        return labels_map
+
+    labels_map = make_labels_map(original_code, exception_entries)
+
+    exceptions_map = {}
+    for start, end, target, _, _ in exception_entries:
+        exceptions_map[start] = labels_map[target]
+        exceptions_map[end] = -1
+
     starts_line = False
     local_line_number = None
     line_number = None
@@ -621,14 +660,14 @@ def _get_instructions_bytes(code, varname_from_oparg=None,
                 line_number = local_line_number + line_offset
             else:
                 line_number = None
-        is_jump_target = offset in labels
         positions = Positions(*next(co_positions, ()))
         deop = _deoptop(op)
         op = code[offset]
 
         yield Instruction._create(op, arg, offset, start_offset, starts_line, line_number,
-                                  is_jump_target, positions, co_consts=co_consts,
-                                  varname_from_oparg=varname_from_oparg, names=names)
+                                  positions, co_consts=co_consts,
+                                  varname_from_oparg=varname_from_oparg, names=names,
+                                  labels_map=labels_map, exceptions_map=exceptions_map)
 
         caches = _get_cache_size(_all_opname[deop])
         if not caches:
@@ -649,11 +688,12 @@ def _get_instructions_bytes(code, varname_from_oparg=None,
                 else:
                     argrepr = ""
                 yield Instruction(
-                    "CACHE", CACHE, 0, None, argrepr, offset, offset, False, None, False,
+                    "CACHE", CACHE, 0, None, argrepr, offset, offset, False, None, None,
                     Positions(*next(co_positions, ()))
                 )
 
-def disassemble(co, lasti=-1, *, file=None, show_caches=False, adaptive=False):
+def disassemble(co, lasti=-1, *, file=None, show_caches=False, adaptive=False,
+                show_offsets=False):
     """Disassemble a code object."""
     linestarts = dict(findlinestarts(co))
     exception_entries = _parse_exception_table(co)
@@ -662,10 +702,10 @@ def disassemble(co, lasti=-1, *, file=None, show_caches=False, adaptive=False):
                        co.co_names, co.co_consts, linestarts, file=file,
                        exception_entries=exception_entries,
                        co_positions=co.co_positions(), show_caches=show_caches,
-                       original_code=co.co_code)
+                       original_code=co.co_code, show_offsets=show_offsets)
 
-def _disassemble_recursive(co, *, file=None, depth=None, show_caches=False, adaptive=False):
-    disassemble(co, file=file, show_caches=show_caches, adaptive=adaptive)
+def _disassemble_recursive(co, *, file=None, depth=None, show_caches=False, adaptive=False, show_offsets=False):
+    disassemble(co, file=file, show_caches=show_caches, adaptive=adaptive, show_offsets=show_offsets)
     if depth is None or depth > 0:
         if depth is not None:
             depth = depth - 1
@@ -674,13 +714,15 @@ def _disassemble_recursive(co, *, file=None, depth=None, show_caches=False, adap
                 print(file=file)
                 print("Disassembly of %r:" % (x,), file=file)
                 _disassemble_recursive(
-                    x, file=file, depth=depth, show_caches=show_caches, adaptive=adaptive
+                    x, file=file, depth=depth, show_caches=show_caches,
+                    adaptive=adaptive, show_offsets=show_offsets
                 )
 
 def _disassemble_bytes(code, lasti=-1, varname_from_oparg=None,
                        names=None, co_consts=None, linestarts=None,
                        *, file=None, line_offset=0, exception_entries=(),
-                       co_positions=None, show_caches=False, original_code=None):
+                       co_positions=None, show_caches=False, original_code=None,
+                       show_offsets=False):
     # Omit the line number column entirely if we have no line number info
     if bool(linestarts):
         linestarts_ints = [line for line in linestarts.values() if line is not None]
@@ -699,11 +741,15 @@ def _disassemble_bytes(code, lasti=-1, varname_from_oparg=None,
             lineno_width = len(str(None))
     else:
         lineno_width = 0
-    maxoffset = len(code) - 2
-    if maxoffset >= 10000:
-        offset_width = len(str(maxoffset))
+    if show_offsets:
+        maxoffset = len(code) - 2
+        if maxoffset >= 10000:
+            offset_width = len(str(maxoffset))
+        else:
+            offset_width = 4
     else:
-        offset_width = 4
+        offset_width = 0
+
     for instr in _get_instructions_bytes(code, varname_from_oparg, names,
                                          co_consts, linestarts,
                                          line_offset=line_offset,
@@ -728,8 +774,10 @@ def _disassemble_bytes(code, lasti=-1, varname_from_oparg=None,
         print("ExceptionTable:", file=file)
         for entry in exception_entries:
             lasti = " lasti" if entry.lasti else ""
-            end = entry.end-2
-            print(f"  {entry.start} to {end} -> {entry.target} [{entry.depth}]{lasti}", file=file)
+            start = entry.start_label
+            end = entry.end_label
+            target = entry.target_label
+            print(f"  L{start} to L{end} -> L{target} [{entry.depth}]{lasti}", file=file)
 
 def _disassemble_str(source, **kwargs):
     """Compile the source string, then disassemble the code object."""
@@ -850,7 +898,7 @@ class Bytecode:
 
     Iterating over this yields the bytecode operations as Instruction instances.
     """
-    def __init__(self, x, *, first_line=None, current_offset=None, show_caches=False, adaptive=False):
+    def __init__(self, x, *, first_line=None, current_offset=None, show_caches=False, adaptive=False, show_offsets=False):
         self.codeobj = co = _get_code_object(x)
         if first_line is None:
             self.first_line = co.co_firstlineno
@@ -864,6 +912,7 @@ def __init__(self, x, *, first_line=None, current_offset=None, show_caches=False
         self.exception_entries = _parse_exception_table(co)
         self.show_caches = show_caches
         self.adaptive = adaptive
+        self.show_offsets = show_offsets
 
     def __iter__(self):
         co = self.codeobj
@@ -912,7 +961,8 @@ def dis(self):
                                exception_entries=self.exception_entries,
                                co_positions=co.co_positions(),
                                show_caches=self.show_caches,
-                               original_code=co.co_code)
+                               original_code=co.co_code,
+                               show_offsets=self.show_offsets)
             return output.getvalue()
 
 
@@ -922,12 +972,14 @@ def main():
     parser = argparse.ArgumentParser()
     parser.add_argument('-C', '--show-caches', action='store_true',
                         help='show inline caches')
+    parser.add_argument('-O', '--show-offsets', action='store_true',
+                        help='show instruction offsets')
     parser.add_argument('infile', type=argparse.FileType('rb'), nargs='?', default='-')
     args = parser.parse_args()
     with args.infile as infile:
         source = infile.read()
     code = compile(source, args.infile.name, "exec")
-    dis(code, show_caches=args.show_caches)
+    dis(code, show_caches=args.show_caches, show_offsets=args.show_offsets)
 
 if __name__ == "__main__":
     main()
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 43debdcf6e1607..0e7c59c5797f6c 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -42,45 +42,45 @@ def cm(cls, x):
         cls.x = x == 1
 
 dis_c_instance_method = """\
-%3d        RESUME                   0
-
-%3d        LOAD_FAST                1 (x)
-           LOAD_CONST               1 (1)
-           COMPARE_OP              72 (==)
-           LOAD_FAST                0 (self)
-           STORE_ATTR               0 (x)
-           RETURN_CONST             0 (None)
+%3d           RESUME                   0
+
+%3d           LOAD_FAST                1 (x)
+              LOAD_CONST               1 (1)
+              COMPARE_OP              72 (==)
+              LOAD_FAST                0 (self)
+              STORE_ATTR               0 (x)
+              RETURN_CONST             0 (None)
 """ % (_C.__init__.__code__.co_firstlineno, _C.__init__.__code__.co_firstlineno + 1,)
 
 dis_c_instance_method_bytes = """\
-       RESUME                   0
-       LOAD_FAST                1
-       LOAD_CONST               1
-       COMPARE_OP              72 (==)
-       LOAD_FAST                0
-       STORE_ATTR               0
-       RETURN_CONST             0
+          RESUME                   0
+          LOAD_FAST                1
+          LOAD_CONST               1
+          COMPARE_OP              72 (==)
+          LOAD_FAST                0
+          STORE_ATTR               0
+          RETURN_CONST             0
 """
 
 dis_c_class_method = """\
-%3d        RESUME                   0
-
-%3d        LOAD_FAST                1 (x)
-           LOAD_CONST               1 (1)
-           COMPARE_OP              72 (==)
-           LOAD_FAST                0 (cls)
-           STORE_ATTR               0 (x)
-           RETURN_CONST             0 (None)
+%3d           RESUME                   0
+
+%3d           LOAD_FAST                1 (x)
+              LOAD_CONST               1 (1)
+              COMPARE_OP              72 (==)
+              LOAD_FAST                0 (cls)
+              STORE_ATTR               0 (x)
+              RETURN_CONST             0 (None)
 """ % (_C.cm.__code__.co_firstlineno, _C.cm.__code__.co_firstlineno + 2,)
 
 dis_c_static_method = """\
-%3d        RESUME                   0
+%3d           RESUME                   0
 
-%3d        LOAD_FAST                0 (x)
-           LOAD_CONST               1 (1)
-           COMPARE_OP              72 (==)
-           STORE_FAST               0 (x)
-           RETURN_CONST             0 (None)
+%3d           LOAD_FAST                0 (x)
+              LOAD_CONST               1 (1)
+              COMPARE_OP              72 (==)
+              STORE_FAST               0 (x)
+              RETURN_CONST             0 (None)
 """ % (_C.sm.__code__.co_firstlineno, _C.sm.__code__.co_firstlineno + 2,)
 
 # Class disassembling info has an extra newline at end.
@@ -100,51 +100,63 @@ def _f(a):
     return 1
 
 dis_f = """\
-%3d        RESUME                   0
+%3d           RESUME                   0
 
-%3d        LOAD_GLOBAL              1 (print + NULL)
-           LOAD_FAST                0 (a)
-           CALL                     1
-           POP_TOP
+%3d           LOAD_GLOBAL              1 (print + NULL)
+              LOAD_FAST                0 (a)
+              CALL                     1
+              POP_TOP
 
-%3d        RETURN_CONST             1 (1)
+%3d           RETURN_CONST             1 (1)
+""" % (_f.__code__.co_firstlineno,
+       _f.__code__.co_firstlineno + 1,
+       _f.__code__.co_firstlineno + 2)
+
+dis_f_with_offsets = """\
+%3d          0       RESUME                   0
+
+%3d          2       LOAD_GLOBAL              1 (print + NULL)
+            12       LOAD_FAST                0 (a)
+            14       CALL                     1
+            22       POP_TOP
+
+%3d         24       RETURN_CONST             1 (1)
 """ % (_f.__code__.co_firstlineno,
        _f.__code__.co_firstlineno + 1,
        _f.__code__.co_firstlineno + 2)
 
 
 dis_f_co_code = """\
-       RESUME                   0
-       LOAD_GLOBAL              1
-       LOAD_FAST                0
-       CALL                     1
-       POP_TOP
-       RETURN_CONST             1
+          RESUME                   0
+          LOAD_GLOBAL              1
+          LOAD_FAST                0
+          CALL                     1
+          POP_TOP
+          RETURN_CONST             1
 """
 
-
 def bug708901():
     for res in range(1,
                      10):
         pass
 
 dis_bug708901 = """\
-%3d        RESUME                   0
+%3d           RESUME                   0
 
-%3d        LOAD_GLOBAL              1 (range + NULL)
-           LOAD_CONST               1 (1)
+%3d           LOAD_GLOBAL              1 (range + NULL)
+              LOAD_CONST               1 (1)
 
-%3d        LOAD_CONST               2 (10)
+%3d           LOAD_CONST               2 (10)
 
-%3d        CALL                     2
-           GET_ITER
-        >> FOR_ITER                 3 (to 36)
-           STORE_FAST               0 (res)
+%3d           CALL                     2
+              GET_ITER
+      L1:     FOR_ITER                 3 (to L2)
+              STORE_FAST               0 (res)
 
-%3d        JUMP_BACKWARD            5 (to 26)
+%3d           JUMP_BACKWARD            5 (to L1)
 
-%3d     >> END_FOR
-           RETURN_CONST             0 (None)
+%3d   L2:     END_FOR
+              RETURN_CONST             0 (None)
 """ % (bug708901.__code__.co_firstlineno,
        bug708901.__code__.co_firstlineno + 1,
        bug708901.__code__.co_firstlineno + 2,
@@ -159,20 +171,20 @@ def bug1333982(x=[]):
     pass
 
 dis_bug1333982 = """\
-%3d        RESUME                   0
+%3d           RESUME                   0
 
-%3d        LOAD_ASSERTION_ERROR
-           LOAD_CONST               1 (<code object <genexpr> at 0x..., file "%s", line %d>)
-           MAKE_FUNCTION
-           LOAD_FAST                0 (x)
-           GET_ITER
-           CALL                     0
+%3d           LOAD_ASSERTION_ERROR
+              LOAD_CONST               1 (<code object <genexpr> at 0x..., file "%s", line %d>)
+              MAKE_FUNCTION
+              LOAD_FAST                0 (x)
+              GET_ITER
+              CALL                     0
 
-%3d        LOAD_CONST               2 (1)
+%3d           LOAD_CONST               2 (1)
 
-%3d        BINARY_OP                0 (+)
-           CALL                     0
-           RAISE_VARARGS            1
+%3d           BINARY_OP                0 (+)
+              CALL                     0
+              RAISE_VARARGS            1
 """ % (bug1333982.__code__.co_firstlineno,
        bug1333982.__code__.co_firstlineno + 1,
        __file__,
@@ -190,8 +202,8 @@ def bug42562():
 
 
 dis_bug42562 = """\
-       RESUME                   0
-       RETURN_CONST             0 (None)
+          RESUME                   0
+          RETURN_CONST             0 (None)
 """
 
 # Extended arg followed by NOP
@@ -204,11 +216,11 @@ def bug42562():
     ])
 
 dis_bug_45757 = """\
-       EXTENDED_ARG             1
-       NOP
-       EXTENDED_ARG             1
-       LOAD_CONST             297
-       RETURN_VALUE
+          EXTENDED_ARG             1
+          NOP
+          EXTENDED_ARG             1
+          LOAD_CONST             297
+          RETURN_VALUE
 """
 
 # [255, 255, 255, 252] is -4 in a 4 byte signed integer
@@ -221,10 +233,10 @@ def bug42562():
 
 
 dis_bug46724 = """\
-    >> EXTENDED_ARG           255
-       EXTENDED_ARG         65535
-       EXTENDED_ARG         16777215
-       JUMP_FORWARD            -4 (to 0)
+  L1:     EXTENDED_ARG           255
+          EXTENDED_ARG         65535
+          EXTENDED_ARG         16777215
+          JUMP_FORWARD            -4 (to L1)
 """
 
 def func_w_kwargs(a, b, **c):
@@ -234,96 +246,96 @@ def wrap_func_w_kwargs():
     func_w_kwargs(1, 2, c=5)
 
 dis_kw_names = """\
-%3d        RESUME                   0
-
-%3d        LOAD_GLOBAL              1 (func_w_kwargs + NULL)
-           LOAD_CONST               1 (1)
-           LOAD_CONST               2 (2)
-           LOAD_CONST               3 (5)
-           LOAD_CONST               4 (('c',))
-           CALL_KW                  3
-           POP_TOP
-           RETURN_CONST             0 (None)
+%3d           RESUME                   0
+
+%3d           LOAD_GLOBAL              1 (func_w_kwargs + NULL)
+              LOAD_CONST               1 (1)
+              LOAD_CONST               2 (2)
+              LOAD_CONST               3 (5)
+              LOAD_CONST               4 (('c',))
+              CALL_KW                  3
+              POP_TOP
+              RETURN_CONST             0 (None)
 """ % (wrap_func_w_kwargs.__code__.co_firstlineno,
        wrap_func_w_kwargs.__code__.co_firstlineno + 1)
 
 dis_intrinsic_1_2 = """\
-  0        RESUME                   0
-
-  1        LOAD_CONST               0 (0)
-           LOAD_CONST               1 (('*',))
-           IMPORT_NAME              0 (math)
-           CALL_INTRINSIC_1         2 (INTRINSIC_IMPORT_STAR)
-           POP_TOP
-           RETURN_CONST             2 (None)
+  0           RESUME                   0
+
+  1           LOAD_CONST               0 (0)
+              LOAD_CONST               1 (('*',))
+              IMPORT_NAME              0 (math)
+              CALL_INTRINSIC_1         2 (INTRINSIC_IMPORT_STAR)
+              POP_TOP
+              RETURN_CONST             2 (None)
 """
 
 dis_intrinsic_1_5 = """\
-  0        RESUME                   0
+  0           RESUME                   0
 
-  1        LOAD_NAME                0 (a)
-           CALL_INTRINSIC_1         5 (INTRINSIC_UNARY_POSITIVE)
-           RETURN_VALUE
+  1           LOAD_NAME                0 (a)
+              CALL_INTRINSIC_1         5 (INTRINSIC_UNARY_POSITIVE)
+              RETURN_VALUE
 """
 
 dis_intrinsic_1_6 = """\
-  0        RESUME                   0
+  0           RESUME                   0
 
-  1        BUILD_LIST               0
-           LOAD_NAME                0 (a)
-           LIST_EXTEND              1
-           CALL_INTRINSIC_1         6 (INTRINSIC_LIST_TO_TUPLE)
-           RETURN_VALUE
+  1           BUILD_LIST               0
+              LOAD_NAME                0 (a)
+              LIST_EXTEND              1
+              CALL_INTRINSIC_1         6 (INTRINSIC_LIST_TO_TUPLE)
+              RETURN_VALUE
 """
 
 _BIG_LINENO_FORMAT = """\
-  1        RESUME                   0
+  1           RESUME                   0
 
-%3d        LOAD_GLOBAL              0 (spam)
-           POP_TOP
-           RETURN_CONST             0 (None)
+%3d           LOAD_GLOBAL              0 (spam)
+              POP_TOP
+              RETURN_CONST             0 (None)
 """
 
 _BIG_LINENO_FORMAT2 = """\
-   1        RESUME                   0
+   1           RESUME                   0
 
-%4d        LOAD_GLOBAL              0 (spam)
-            POP_TOP
-            RETURN_CONST             0 (None)
+%4d           LOAD_GLOBAL              0 (spam)
+               POP_TOP
+               RETURN_CONST             0 (None)
 """
 
 dis_module_expected_results = """\
 Disassembly of f:
-  4        RESUME                   0
-           RETURN_CONST             0 (None)
+  4           RESUME                   0
+              RETURN_CONST             0 (None)
 
 Disassembly of g:
-  5        RESUME                   0
-           RETURN_CONST             0 (None)
+  5           RESUME                   0
+              RETURN_CONST             0 (None)
 
 """
 
 expr_str = "x + 1"
 
 dis_expr_str = """\
-  0        RESUME                   0
+  0           RESUME                   0
 
-  1        LOAD_NAME                0 (x)
-           LOAD_CONST               0 (1)
-           BINARY_OP                0 (+)
-           RETURN_VALUE
+  1           LOAD_NAME                0 (x)
+              LOAD_CONST               0 (1)
+              BINARY_OP                0 (+)
+              RETURN_VALUE
 """
 
 simple_stmt_str = "x = x + 1"
 
 dis_simple_stmt_str = """\
-  0        RESUME                   0
+  0           RESUME                   0
 
-  1        LOAD_NAME                0 (x)
-           LOAD_CONST               0 (1)
-           BINARY_OP                0 (+)
-           STORE_NAME               0 (x)
-           RETURN_CONST             1 (None)
+  1           LOAD_NAME                0 (x)
+              LOAD_CONST               0 (1)
+              BINARY_OP                0 (+)
+              STORE_NAME               0 (x)
+              RETURN_CONST             1 (None)
 """
 
 annot_stmt_str = """\
@@ -335,34 +347,34 @@ def wrap_func_w_kwargs():
 # leading newline is for a reason (tests lineno)
 
 dis_annot_stmt_str = """\
-  0        RESUME                   0
-
-  2        SETUP_ANNOTATIONS
-           LOAD_CONST               0 (1)
-           STORE_NAME               0 (x)
-           LOAD_NAME                1 (int)
-           LOAD_NAME                2 (__annotations__)
-           LOAD_CONST               1 ('x')
-           STORE_SUBSCR
-
-  3        LOAD_NAME                3 (fun)
-           PUSH_NULL
-           LOAD_CONST               0 (1)
-           CALL                     1
-           LOAD_NAME                2 (__annotations__)
-           LOAD_CONST               2 ('y')
-           STORE_SUBSCR
-
-  4        LOAD_CONST               0 (1)
-           LOAD_NAME                4 (lst)
-           LOAD_NAME                3 (fun)
-           PUSH_NULL
-           LOAD_CONST               3 (0)
-           CALL                     1
-           STORE_SUBSCR
-           LOAD_NAME                1 (int)
-           POP_TOP
-           RETURN_CONST             4 (None)
+  0           RESUME                   0
+
+  2           SETUP_ANNOTATIONS
+              LOAD_CONST               0 (1)
+              STORE_NAME               0 (x)
+              LOAD_NAME                1 (int)
+              LOAD_NAME                2 (__annotations__)
+              LOAD_CONST               1 ('x')
+              STORE_SUBSCR
+
+  3           LOAD_NAME                3 (fun)
+              PUSH_NULL
+              LOAD_CONST               0 (1)
+              CALL                     1
+              LOAD_NAME                2 (__annotations__)
+              LOAD_CONST               2 ('y')
+              STORE_SUBSCR
+
+  4           LOAD_CONST               0 (1)
+              LOAD_NAME                4 (lst)
+              LOAD_NAME                3 (fun)
+              PUSH_NULL
+              LOAD_CONST               3 (0)
+              CALL                     1
+              STORE_SUBSCR
+              LOAD_NAME                1 (int)
+              POP_TOP
+              RETURN_CONST             4 (None)
 """
 
 compound_stmt_str = """\
@@ -372,64 +384,67 @@ def wrap_func_w_kwargs():
 # Trailing newline has been deliberately omitted
 
 dis_compound_stmt_str = """\
-  0        RESUME                   0
+  0           RESUME                   0
 
-  1        LOAD_CONST               0 (0)
-           STORE_NAME               0 (x)
+  1           LOAD_CONST               0 (0)
+              STORE_NAME               0 (x)
 
-  2        NOP
+  2           NOP
 
-  3     >> LOAD_NAME                0 (x)
-           LOAD_CONST               1 (1)
-           BINARY_OP               13 (+=)
-           STORE_NAME               0 (x)
+  3   L1:     LOAD_NAME                0 (x)
+              LOAD_CONST               1 (1)
+              BINARY_OP               13 (+=)
+              STORE_NAME               0 (x)
 
-  2        JUMP_BACKWARD            7 (to 8)
+  2           JUMP_BACKWARD            7 (to L1)
 """
 
 dis_traceback = """\
-%4d        RESUME                   0
+%4d           RESUME                   0
 
-%4d        NOP
+%4d           NOP
 
-%4d        LOAD_CONST               1 (1)
-            LOAD_CONST               2 (0)
-     -->    BINARY_OP               11 (/)
-            POP_TOP
+%4d   L1:     LOAD_CONST               1 (1)
+               LOAD_CONST               2 (0)
+           --> BINARY_OP               11 (/)
+               POP_TOP
 
-%4d        LOAD_FAST_CHECK          1 (tb)
-            RETURN_VALUE
+%4d   L2:     LOAD_FAST_CHECK          1 (tb)
+               RETURN_VALUE
 
-None     >> PUSH_EXC_INFO
+None   L3:     PUSH_EXC_INFO
 
-%4d        LOAD_GLOBAL              0 (Exception)
-            CHECK_EXC_MATCH
-            POP_JUMP_IF_FALSE       23 (to 82)
-            STORE_FAST               0 (e)
+%4d           LOAD_GLOBAL              0 (Exception)
+               CHECK_EXC_MATCH
+               POP_JUMP_IF_FALSE       23 (to L7)
+               STORE_FAST               0 (e)
 
-%4d        LOAD_FAST                0 (e)
-            LOAD_ATTR                2 (__traceback__)
-            STORE_FAST               1 (tb)
-            POP_EXCEPT
-            LOAD_CONST               0 (None)
-            STORE_FAST               0 (e)
-            DELETE_FAST              0 (e)
+%4d   L4:     LOAD_FAST                0 (e)
+               LOAD_ATTR                2 (__traceback__)
+               STORE_FAST               1 (tb)
+       L5:     POP_EXCEPT
+               LOAD_CONST               0 (None)
+               STORE_FAST               0 (e)
+               DELETE_FAST              0 (e)
 
-%4d        LOAD_FAST                1 (tb)
-            RETURN_VALUE
+%4d           LOAD_FAST                1 (tb)
+               RETURN_VALUE
 
-None     >> LOAD_CONST               0 (None)
-            STORE_FAST               0 (e)
-            DELETE_FAST              0 (e)
-            RERAISE                  1
+None   L6:     LOAD_CONST               0 (None)
+               STORE_FAST               0 (e)
+               DELETE_FAST              0 (e)
+               RERAISE                  1
 
-%4d     >> RERAISE                  0
+%4d   L7:     RERAISE                  0
 
-None     >> COPY                     3
-            POP_EXCEPT
-            RERAISE                  1
+None   L8:     COPY                     3
+               POP_EXCEPT
+               RERAISE                  1
 ExceptionTable:
-4 rows
+  L1 to L2 -> L3 [0]
+  L3 to L4 -> L8 [1] lasti
+  L4 to L5 -> L6 [1] lasti
+  L6 to L8 -> L8 [1] lasti
 """ % (TRACEBACK_CODE.co_firstlineno,
        TRACEBACK_CODE.co_firstlineno + 1,
        TRACEBACK_CODE.co_firstlineno + 2,
@@ -443,25 +458,25 @@ def _fstring(a, b, c, d):
     return f'{a} {b:4} {c!r} {d!r:4}'
 
 dis_fstring = """\
-%3d        RESUME                   0
-
-%3d        LOAD_FAST                0 (a)
-           FORMAT_SIMPLE
-           LOAD_CONST               1 (' ')
-           LOAD_FAST                1 (b)
-           LOAD_CONST               2 ('4')
-           FORMAT_WITH_SPEC
-           LOAD_CONST               1 (' ')
-           LOAD_FAST                2 (c)
-           CONVERT_VALUE            2 (repr)
-           FORMAT_SIMPLE
-           LOAD_CONST               1 (' ')
-           LOAD_FAST                3 (d)
-           CONVERT_VALUE            2 (repr)
-           LOAD_CONST               2 ('4')
-           FORMAT_WITH_SPEC
-           BUILD_STRING             7
-           RETURN_VALUE
+%3d           RESUME                   0
+
+%3d           LOAD_FAST                0 (a)
+              FORMAT_SIMPLE
+              LOAD_CONST               1 (' ')
+              LOAD_FAST                1 (b)
+              LOAD_CONST               2 ('4')
+              FORMAT_WITH_SPEC
+              LOAD_CONST               1 (' ')
+              LOAD_FAST                2 (c)
+              CONVERT_VALUE            2 (repr)
+              FORMAT_SIMPLE
+              LOAD_CONST               1 (' ')
+              LOAD_FAST                3 (d)
+              CONVERT_VALUE            2 (repr)
+              LOAD_CONST               2 ('4')
+              FORMAT_WITH_SPEC
+              BUILD_STRING             7
+              RETURN_VALUE
 """ % (_fstring.__code__.co_firstlineno, _fstring.__code__.co_firstlineno + 1)
 
 def _with(c):
@@ -470,44 +485,45 @@ def _with(c):
     y = 2
 
 dis_with = """\
-%4d        RESUME                   0
-
-%4d        LOAD_FAST                0 (c)
-            BEFORE_WITH
-            POP_TOP
-
-%4d        LOAD_CONST               1 (1)
-            STORE_FAST               1 (x)
-
-%4d        LOAD_CONST               0 (None)
-            LOAD_CONST               0 (None)
-            LOAD_CONST               0 (None)
-            CALL                     2
-            POP_TOP
-
-%4d        LOAD_CONST               2 (2)
-            STORE_FAST               2 (y)
-            RETURN_CONST             0 (None)
-
-%4d     >> PUSH_EXC_INFO
-            WITH_EXCEPT_START
-            TO_BOOL
-            POP_JUMP_IF_TRUE         1 (to 52)
-            RERAISE                  2
-         >> POP_TOP
-            POP_EXCEPT
-            POP_TOP
-            POP_TOP
-
-%4d        LOAD_CONST               2 (2)
-            STORE_FAST               2 (y)
-            RETURN_CONST             0 (None)
-
-None     >> COPY                     3
-            POP_EXCEPT
-            RERAISE                  1
+%4d           RESUME                   0
+
+%4d           LOAD_FAST                0 (c)
+               BEFORE_WITH
+       L1:     POP_TOP
+
+%4d           LOAD_CONST               1 (1)
+               STORE_FAST               1 (x)
+
+%4d   L2:     LOAD_CONST               0 (None)
+               LOAD_CONST               0 (None)
+               LOAD_CONST               0 (None)
+               CALL                     2
+               POP_TOP
+
+%4d           LOAD_CONST               2 (2)
+               STORE_FAST               2 (y)
+               RETURN_CONST             0 (None)
+
+%4d   L3:     PUSH_EXC_INFO
+               WITH_EXCEPT_START
+               TO_BOOL
+               POP_JUMP_IF_TRUE         1 (to L4)
+               RERAISE                  2
+       L4:     POP_TOP
+       L5:     POP_EXCEPT
+               POP_TOP
+               POP_TOP
+
+%4d           LOAD_CONST               2 (2)
+               STORE_FAST               2 (y)
+               RETURN_CONST             0 (None)
+
+None   L6:     COPY                     3
+               POP_EXCEPT
+               RERAISE                  1
 ExceptionTable:
-2 rows
+  L1 to L2 -> L3 [1] lasti
+  L3 to L5 -> L6 [3] lasti
 """ % (_with.__code__.co_firstlineno,
        _with.__code__.co_firstlineno + 1,
        _with.__code__.co_firstlineno + 2,
@@ -523,78 +539,89 @@ async def _asyncwith(c):
     y = 2
 
 dis_asyncwith = """\
-%4d        RETURN_GENERATOR
-            POP_TOP
-            RESUME                   0
-
-%4d        LOAD_FAST                0 (c)
-            BEFORE_ASYNC_WITH
-            GET_AWAITABLE            1
-            LOAD_CONST               0 (None)
-         >> SEND                     3 (to 24)
-            YIELD_VALUE              1
-            RESUME                   3
-            JUMP_BACKWARD_NO_INTERRUPT 5 (to 14)
-         >> END_SEND
-            POP_TOP
-
-%4d        LOAD_CONST               1 (1)
-            STORE_FAST               1 (x)
-
-%4d        LOAD_CONST               0 (None)
-            LOAD_CONST               0 (None)
-            LOAD_CONST               0 (None)
-            CALL                     2
-            GET_AWAITABLE            2
-            LOAD_CONST               0 (None)
-         >> SEND                     3 (to 60)
-            YIELD_VALUE              1
-            RESUME                   3
-            JUMP_BACKWARD_NO_INTERRUPT 5 (to 50)
-         >> END_SEND
-            POP_TOP
-
-%4d        LOAD_CONST               2 (2)
-            STORE_FAST               2 (y)
-            RETURN_CONST             0 (None)
-
-%4d     >> CLEANUP_THROW
-
-None        JUMP_BACKWARD           26 (to 24)
-
-%4d     >> CLEANUP_THROW
-
-None        JUMP_BACKWARD           11 (to 60)
-
-%4d     >> PUSH_EXC_INFO
-            WITH_EXCEPT_START
-            GET_AWAITABLE            2
-            LOAD_CONST               0 (None)
-         >> SEND                     4 (to 102)
-            YIELD_VALUE              1
-            RESUME                   3
-            JUMP_BACKWARD_NO_INTERRUPT 5 (to 90)
-         >> CLEANUP_THROW
-         >> END_SEND
-            TO_BOOL
-            POP_JUMP_IF_TRUE         1 (to 118)
-            RERAISE                  2
-         >> POP_TOP
-            POP_EXCEPT
-            POP_TOP
-            POP_TOP
-
-%4d        LOAD_CONST               2 (2)
-            STORE_FAST               2 (y)
-            RETURN_CONST             0 (None)
-
-None     >> COPY                     3
-            POP_EXCEPT
-            RERAISE                  1
-         >> CALL_INTRINSIC_1         3 (INTRINSIC_STOPITERATION_ERROR)
-            RERAISE                  1
+%4d            RETURN_GENERATOR
+                POP_TOP
+        L1:     RESUME                   0
+
+%4d            LOAD_FAST                0 (c)
+                BEFORE_ASYNC_WITH
+                GET_AWAITABLE            1
+                LOAD_CONST               0 (None)
+        L2:     SEND                     3 (to L5)
+        L3:     YIELD_VALUE              1
+        L4:     RESUME                   3
+                JUMP_BACKWARD_NO_INTERRUPT 5 (to L2)
+        L5:     END_SEND
+        L6:     POP_TOP
+
+%4d            LOAD_CONST               1 (1)
+                STORE_FAST               1 (x)
+
+%4d    L7:     LOAD_CONST               0 (None)
+                LOAD_CONST               0 (None)
+                LOAD_CONST               0 (None)
+                CALL                     2
+                GET_AWAITABLE            2
+                LOAD_CONST               0 (None)
+        L8:     SEND                     3 (to L11)
+        L9:     YIELD_VALUE              1
+       L10:     RESUME                   3
+                JUMP_BACKWARD_NO_INTERRUPT 5 (to L8)
+       L11:     END_SEND
+                POP_TOP
+
+%4d            LOAD_CONST               2 (2)
+                STORE_FAST               2 (y)
+                RETURN_CONST             0 (None)
+
+%4d   L12:     CLEANUP_THROW
+
+None   L13:     JUMP_BACKWARD           26 (to L5)
+
+%4d   L14:     CLEANUP_THROW
+
+None   L15:     JUMP_BACKWARD           11 (to L11)
+
+%4d   L16:     PUSH_EXC_INFO
+                WITH_EXCEPT_START
+                GET_AWAITABLE            2
+                LOAD_CONST               0 (None)
+       L17:     SEND                     4 (to L21)
+       L18:     YIELD_VALUE              1
+       L19:     RESUME                   3
+                JUMP_BACKWARD_NO_INTERRUPT 5 (to L17)
+       L20:     CLEANUP_THROW
+       L21:     END_SEND
+                TO_BOOL
+                POP_JUMP_IF_TRUE         1 (to L22)
+                RERAISE                  2
+       L22:     POP_TOP
+       L23:     POP_EXCEPT
+                POP_TOP
+                POP_TOP
+
+%4d            LOAD_CONST               2 (2)
+                STORE_FAST               2 (y)
+                RETURN_CONST             0 (None)
+
+None   L24:     COPY                     3
+                POP_EXCEPT
+                RERAISE                  1
+       L25:     CALL_INTRINSIC_1         3 (INTRINSIC_STOPITERATION_ERROR)
+                RERAISE                  1
 ExceptionTable:
-12 rows
+  L1 to L3 -> L25 [0] lasti
+  L3 to L4 -> L12 [3]
+  L4 to L6 -> L25 [0] lasti
+  L6 to L7 -> L16 [1] lasti
+  L7 to L9 -> L25 [0] lasti
+  L9 to L10 -> L14 [2]
+  L10 to L13 -> L25 [0] lasti
+  L14 to L15 -> L25 [0] lasti
+  L16 to L18 -> L24 [3] lasti
+  L18 to L19 -> L20 [6]
+  L19 to L23 -> L24 [3] lasti
+  L23 to L25 -> L25 [0] lasti
 """ % (_asyncwith.__code__.co_firstlineno,
        _asyncwith.__code__.co_firstlineno + 1,
        _asyncwith.__code__.co_firstlineno + 2,
@@ -620,31 +647,32 @@ def _tryfinallyconst(b):
         b()
 
 dis_tryfinally = """\
-%4d        RESUME                   0
+%4d           RESUME                   0
 
-%4d        NOP
+%4d           NOP
 
-%4d        LOAD_FAST                0 (a)
+%4d   L1:     LOAD_FAST                0 (a)
 
-%4d        LOAD_FAST                1 (b)
-            PUSH_NULL
-            CALL                     0
-            POP_TOP
-            RETURN_VALUE
+%4d   L2:     LOAD_FAST                1 (b)
+               PUSH_NULL
+               CALL                     0
+               POP_TOP
+               RETURN_VALUE
 
-None     >> PUSH_EXC_INFO
+None   L3:     PUSH_EXC_INFO
 
-%4d        LOAD_FAST                1 (b)
-            PUSH_NULL
-            CALL                     0
-            POP_TOP
-            RERAISE                  0
+%4d           LOAD_FAST                1 (b)
+               PUSH_NULL
+               CALL                     0
+               POP_TOP
+               RERAISE                  0
 
-None     >> COPY                     3
-            POP_EXCEPT
-            RERAISE                  1
+None   L4:     COPY                     3
+               POP_EXCEPT
+               RERAISE                  1
 ExceptionTable:
-2 rows
+  L1 to L2 -> L3 [0]
+  L3 to L4 -> L4 [1] lasti
 """ % (_tryfinally.__code__.co_firstlineno,
        _tryfinally.__code__.co_firstlineno + 1,
        _tryfinally.__code__.co_firstlineno + 2,
@@ -653,31 +681,31 @@ def _tryfinallyconst(b):
        )
 
 dis_tryfinallyconst = """\
-%4d        RESUME                   0
+%4d           RESUME                   0
 
-%4d        NOP
+%4d           NOP
 
-%4d        NOP
+%4d           NOP
 
-%4d        LOAD_FAST                0 (b)
-            PUSH_NULL
-            CALL                     0
-            POP_TOP
-            RETURN_CONST             1 (1)
+%4d           LOAD_FAST                0 (b)
+               PUSH_NULL
+               CALL                     0
+               POP_TOP
+               RETURN_CONST             1 (1)
 
-None        PUSH_EXC_INFO
+None   L1:     PUSH_EXC_INFO
 
-%4d        LOAD_FAST                0 (b)
-            PUSH_NULL
-            CALL                     0
-            POP_TOP
-            RERAISE                  0
+%4d           LOAD_FAST                0 (b)
+               PUSH_NULL
+               CALL                     0
+               POP_TOP
+               RERAISE                  0
 
-None     >> COPY                     3
-            POP_EXCEPT
-            RERAISE                  1
+None   L2:     COPY                     3
+               POP_EXCEPT
+               RERAISE                  1
 ExceptionTable:
-1 row
+  L1 to L2 -> L2 [1] lasti
 """ % (_tryfinallyconst.__code__.co_firstlineno,
        _tryfinallyconst.__code__.co_firstlineno + 1,
        _tryfinallyconst.__code__.co_firstlineno + 2,
@@ -702,19 +730,19 @@ def foo(x):
     return foo
 
 dis_nested_0 = """\
-None        MAKE_CELL                0 (y)
+None           MAKE_CELL                0 (y)
 
-%4d        RESUME                   0
+%4d           RESUME                   0
 
-%4d        LOAD_FAST                0 (y)
-            BUILD_TUPLE              1
-            LOAD_CONST               1 (<code object foo at 0x..., file "%s", line %d>)
-            MAKE_FUNCTION
-            SET_FUNCTION_ATTRIBUTE   8 (closure)
-            STORE_FAST               1 (foo)
+%4d           LOAD_FAST                0 (y)
+               BUILD_TUPLE              1
+               LOAD_CONST               1 (<code object foo at 0x..., file "%s", line %d>)
+               MAKE_FUNCTION
+               SET_FUNCTION_ATTRIBUTE   8 (closure)
+               STORE_FAST               1 (foo)
 
-%4d        LOAD_FAST                1 (foo)
-            RETURN_VALUE
+%4d           LOAD_FAST                1 (foo)
+               RETURN_VALUE
 """ % (_h.__code__.co_firstlineno,
        _h.__code__.co_firstlineno + 1,
        __file__,
@@ -724,22 +752,22 @@ def foo(x):
 
 dis_nested_1 = """%s
 Disassembly of <code object foo at 0x..., file "%s", line %d>:
-None        COPY_FREE_VARS           1
-            MAKE_CELL                0 (x)
-
-%4d        RESUME                   0
-
-%4d        LOAD_GLOBAL              1 (list + NULL)
-            LOAD_FAST                0 (x)
-            BUILD_TUPLE              1
-            LOAD_CONST               1 (<code object <genexpr> at 0x..., file "%s", line %d>)
-            MAKE_FUNCTION
-            SET_FUNCTION_ATTRIBUTE   8 (closure)
-            LOAD_DEREF               1 (y)
-            GET_ITER
-            CALL                     0
-            CALL                     1
-            RETURN_VALUE
+None           COPY_FREE_VARS           1
+               MAKE_CELL                0 (x)
+
+%4d           RESUME                   0
+
+%4d           LOAD_GLOBAL              1 (list + NULL)
+               LOAD_FAST                0 (x)
+               BUILD_TUPLE              1
+               LOAD_CONST               1 (<code object <genexpr> at 0x..., file "%s", line %d>)
+               MAKE_FUNCTION
+               SET_FUNCTION_ATTRIBUTE   8 (closure)
+               LOAD_DEREF               1 (y)
+               GET_ITER
+               CALL                     0
+               CALL                     1
+               RETURN_VALUE
 """ % (dis_nested_0,
        __file__,
        _h.__code__.co_firstlineno + 1,
@@ -751,28 +779,28 @@ def foo(x):
 
 dis_nested_2 = """%s
 Disassembly of <code object <genexpr> at 0x..., file "%s", line %d>:
-None        COPY_FREE_VARS           1
-
-%4d        RETURN_GENERATOR
-            POP_TOP
-            RESUME                   0
-            LOAD_FAST                0 (.0)
-         >> FOR_ITER                10 (to 34)
-            STORE_FAST               1 (z)
-            LOAD_DEREF               2 (x)
-            LOAD_FAST                1 (z)
-            BINARY_OP                0 (+)
-            YIELD_VALUE              0
-            RESUME                   5
-            POP_TOP
-            JUMP_BACKWARD           12 (to 10)
-         >> END_FOR
-            RETURN_CONST             0 (None)
-
-None     >> CALL_INTRINSIC_1         3 (INTRINSIC_STOPITERATION_ERROR)
-            RERAISE                  1
+None           COPY_FREE_VARS           1
+
+%4d           RETURN_GENERATOR
+               POP_TOP
+       L1:     RESUME                   0
+               LOAD_FAST                0 (.0)
+       L2:     FOR_ITER                10 (to L3)
+               STORE_FAST               1 (z)
+               LOAD_DEREF               2 (x)
+               LOAD_FAST                1 (z)
+               BINARY_OP                0 (+)
+               YIELD_VALUE              0
+               RESUME                   5
+               POP_TOP
+               JUMP_BACKWARD           12 (to L2)
+       L3:     END_FOR
+               RETURN_CONST             0 (None)
+
+None   L4:     CALL_INTRINSIC_1         3 (INTRINSIC_STOPITERATION_ERROR)
+               RERAISE                  1
 ExceptionTable:
-1 row
+  L1 to L4 -> L4 [0] lasti
 """ % (dis_nested_1,
        __file__,
        _h.__code__.co_firstlineno + 3,
@@ -784,14 +812,14 @@ def load_test(x, y=0):
     return a, b
 
 dis_load_test_quickened_code = """\
-%3d           0 RESUME_CHECK             0
+%3d           RESUME_CHECK             0
 
-%3d           2 LOAD_FAST_LOAD_FAST      1 (x, y)
-              4 STORE_FAST_STORE_FAST   50 (b, a)
+%3d           LOAD_FAST_LOAD_FAST      1 (x, y)
+              STORE_FAST_STORE_FAST   50 (b, a)
 
-%3d           6 LOAD_FAST_LOAD_FAST     35 (a, b)
-              8 BUILD_TUPLE              2
-             10 RETURN_VALUE
+%3d           LOAD_FAST_LOAD_FAST     35 (a, b)
+              BUILD_TUPLE              2
+              RETURN_VALUE
 """ % (load_test.__code__.co_firstlineno,
        load_test.__code__.co_firstlineno + 1,
        load_test.__code__.co_firstlineno + 2)
@@ -801,25 +829,25 @@ def loop_test():
         load_test(i)
 
 dis_loop_test_quickened_code = """\
-%3d        RESUME_CHECK             0
-
-%3d        BUILD_LIST               0
-           LOAD_CONST               1 ((1, 2, 3))
-           LIST_EXTEND              1
-           LOAD_CONST               2 (3)
-           BINARY_OP                5 (*)
-           GET_ITER
-        >> FOR_ITER_LIST           14 (to 48)
-           STORE_FAST               0 (i)
-
-%3d        LOAD_GLOBAL_MODULE       1 (load_test + NULL)
-           LOAD_FAST                0 (i)
-           CALL_PY_WITH_DEFAULTS    1
-           POP_TOP
-           JUMP_BACKWARD           16 (to 16)
-
-%3d     >> END_FOR
-           RETURN_CONST             0 (None)
+%3d           RESUME_CHECK             0
+
+%3d           BUILD_LIST               0
+              LOAD_CONST               1 ((1, 2, 3))
+              LIST_EXTEND              1
+              LOAD_CONST               2 (3)
+              BINARY_OP                5 (*)
+              GET_ITER
+      L1:     FOR_ITER_LIST           14 (to L2)
+              STORE_FAST               0 (i)
+
+%3d           LOAD_GLOBAL_MODULE       1 (load_test + NULL)
+              LOAD_FAST                0 (i)
+              CALL_PY_WITH_DEFAULTS    1
+              POP_TOP
+              JUMP_BACKWARD           16 (to L1)
+
+%3d   L2:     END_FOR
+              RETURN_CONST             0 (None)
 """ % (loop_test.__code__.co_firstlineno,
        loop_test.__code__.co_firstlineno + 1,
        loop_test.__code__.co_firstlineno + 2,
@@ -829,14 +857,14 @@ def extended_arg_quick():
     *_, _ = ...
 
 dis_extended_arg_quick_code = """\
-%3d           0 RESUME                   0
-
-%3d           2 LOAD_CONST               1 (Ellipsis)
-              4 EXTENDED_ARG             1
-              6 UNPACK_EX              256
-              8 POP_TOP
-             10 STORE_FAST               0 (_)
-             12 RETURN_CONST             0 (None)
+%3d           RESUME                   0
+
+%3d           LOAD_CONST               1 (Ellipsis)
+              EXTENDED_ARG             1
+              UNPACK_EX              256
+              POP_TOP
+              STORE_FAST               0 (_)
+              RETURN_CONST             0 (None)
 """% (extended_arg_quick.__code__.co_firstlineno,
       extended_arg_quick.__code__.co_firstlineno + 1,)
 
@@ -848,74 +876,19 @@ class DisTestBase(unittest.TestCase):
     def strip_addresses(self, text):
         return re.sub(r'\b0x[0-9A-Fa-f]+\b', '0x...', text)
 
-    def find_offset_column(self, lines):
-        for line in lines:
-            if line and not line.startswith("Disassembly"):
-                break
-        else:
-            return 0, 0
-        offset = 5
-        while (line[offset] == " "):
-            offset += 1
-        if (line[offset] == ">"):
-            offset += 2
-        while (line[offset] == " "):
-            offset += 1
-        end = offset
-        while line[end] in "0123456789":
-            end += 1
-        return end-5, end
-
-    def assert_offsets_increasing(self, text, delta):
-        expected_offset = 0
-        lines = text.splitlines()
-        start, end = self.find_offset_column(lines)
-        for line in lines:
-            if not line:
-                continue
-            if line.startswith("Disassembly"):
-                expected_offset = 0
-                continue
-            if line.startswith("Exception"):
-                break
-            offset = int(line[start:end])
-            self.assertGreaterEqual(offset, expected_offset, line)
-            expected_offset = offset + delta
-
     def assert_exception_table_increasing(self, lines):
         prev_start, prev_end = -1, -1
         count = 0
         for line in lines:
-            m = re.match(r'  (\d+) to (\d+) -> \d+ \[\d+\]', line)
+            m = re.match(r'  L(\d+) to L(\d+) -> L\d+ \[\d+\]', line)
             start, end = [int(g) for g in m.groups()]
             self.assertGreaterEqual(end, start)
-            self.assertGreater(start, prev_end)
+            self.assertGreaterEqual(start, prev_end)
             prev_start, prev_end = start, end
             count += 1
         return count
 
-    def strip_offsets(self, text):
-        lines = text.splitlines(True)
-        start, end = self.find_offset_column(lines)
-        res = []
-        lines = iter(lines)
-        for line in lines:
-            if line.startswith("Exception"):
-                res.append(line)
-                break
-            if not line or line.startswith("Disassembly"):
-                res.append(line)
-            else:
-                res.append(line[:start] + line[end:])
-        num_rows = self.assert_exception_table_increasing(lines)
-        if num_rows:
-            res.append(f"{num_rows} row{'s' if num_rows > 1 else ''}\n")
-        return "".join(res)
-
-    def do_disassembly_compare(self, got, expected, with_offsets=False):
-        if not with_offsets:
-            self.assert_offsets_increasing(got, 2)
-            got = self.strip_offsets(got)
+    def do_disassembly_compare(self, got, expected):
         if got != expected:
             got = self.strip_addresses(got)
         self.assertEqual(got, expected)
@@ -938,17 +911,16 @@ def get_disassembly(self, func, lasti=-1, wrapper=True, **kwargs):
     def get_disassemble_as_string(self, func, lasti=-1):
         return self.get_disassembly(func, lasti, False)
 
-    def do_disassembly_test(self, func, expected, with_offsets=False):
+    def do_disassembly_test(self, func, expected, **kwargs):
         self.maxDiff = None
-        got = self.get_disassembly(func, depth=0)
-        self.do_disassembly_compare(got, expected, with_offsets)
+        got = self.get_disassembly(func, depth=0, **kwargs)
+        self.do_disassembly_compare(got, expected)
         # Add checks for dis.disco
         if hasattr(func, '__code__'):
             got_disco = io.StringIO()
             with contextlib.redirect_stdout(got_disco):
-                dis.disco(func.__code__)
-            self.do_disassembly_compare(got_disco.getvalue(), expected,
-                                        with_offsets)
+                dis.disco(func.__code__, **kwargs)
+            self.do_disassembly_compare(got_disco.getvalue(), expected)
 
     def test_opmap(self):
         self.assertEqual(dis.opmap["CACHE"], 0)
@@ -976,6 +948,9 @@ def test_widths(self):
     def test_dis(self):
         self.do_disassembly_test(_f, dis_f)
 
+    def test_dis_with_offsets(self):
+        self.do_disassembly_test(_f, dis_f_with_offsets, show_offsets=True)
+
     def test_bug_708901(self):
         self.do_disassembly_test(bug708901, dis_bug708901)
 
@@ -1036,41 +1011,6 @@ def func(count):
         from test import dis_module
         self.do_disassembly_test(dis_module, dis_module_expected_results)
 
-    def test_big_offsets(self):
-        self.maxDiff = None
-        def func(count):
-            namespace = {}
-            func = "def foo(x):\n " + ";".join(["x = x + 1"] * count) + "\n return x"
-            exec(func, namespace)
-            return namespace['foo']
-
-        def expected(count, w):
-            s = ['''\
-  1        %*d RESUME                   0
-
-  2        %*d LOAD_FAST                0 (x)
-           %*d LOAD_CONST               1 (1)
-           %*d BINARY_OP                0 (+)
-''' % (w, 0, w, 2, w, 4, w, 6)]
-            s += ['''\
-           %*d STORE_FAST_LOAD_FAST     0 (x, x)
-           %*d LOAD_CONST               1 (1)
-           %*d BINARY_OP                0 (+)
-''' % (w, 8*i + 10, w, 8*i + 12, w, 8*i + 14)
-                 for i in range(count-1)]
-            s += ['''\
-           %*d STORE_FAST               0 (x)
-
-  3        %*d LOAD_FAST                0 (x)
-           %*d RETURN_VALUE
-''' % (w, 8*count + 2, w, 8*count + 4, w, 8*count + 6)]
-            return ''.join(s)
-
-        for i in range(1, 5):
-            self.do_disassembly_test(func(i), expected(i, 4), True)
-        self.do_disassembly_test(func(1200), expected(1200, 4), True)
-        self.do_disassembly_test(func(1300), expected(1300, 5), True)
-
     def test_disassemble_str(self):
         self.do_disassembly_test(expr_str, dis_expr_str)
         self.do_disassembly_test(simple_stmt_str, dis_simple_stmt_str)
@@ -1151,7 +1091,7 @@ def test_dis_traceback(self):
             sys.last_exc = e
 
         tb_dis = self.get_disassemble_as_string(tb.tb_frame.f_code, tb.tb_lasti)
-        self.do_disassembly_test(None, tb_dis, True)
+        self.do_disassembly_test(None, tb_dis)
 
     def test_dis_object(self):
         self.assertRaises(TypeError, dis.dis, object())
@@ -1160,7 +1100,6 @@ def test_disassemble_recursive(self):
         def check(expected, **kwargs):
             dis = self.get_disassembly(_h, **kwargs)
             dis = self.strip_addresses(dis)
-            dis = self.strip_offsets(dis)
             self.assertEqual(dis, expected)
 
         check(dis_nested_0, depth=0)
@@ -1187,73 +1126,73 @@ def code_quicken(f, times=ADAPTIVE_WARMUP_DELAY):
     def test_super_instructions(self):
         self.code_quicken(lambda: load_test(0, 0))
         got = self.get_disassembly(load_test, adaptive=True)
-        self.do_disassembly_compare(got, dis_load_test_quickened_code, True)
+        self.do_disassembly_compare(got, dis_load_test_quickened_code)
 
     @cpython_only
     @requires_specialization
     def test_binary_specialize(self):
         binary_op_quicken = """\
-  0           0 RESUME_CHECK             0
+  0           RESUME_CHECK             0
 
-  1           2 LOAD_NAME                0 (a)
-              4 LOAD_NAME                1 (b)
-              6 %s
-             10 RETURN_VALUE
+  1           LOAD_NAME                0 (a)
+              LOAD_NAME                1 (b)
+              %s
+              RETURN_VALUE
 """
         co_int = compile('a + b', "<int>", "eval")
         self.code_quicken(lambda: exec(co_int, {}, {'a': 1, 'b': 2}))
         got = self.get_disassembly(co_int, adaptive=True)
-        self.do_disassembly_compare(got, binary_op_quicken % "BINARY_OP_ADD_INT        0 (+)", True)
+        self.do_disassembly_compare(got, binary_op_quicken % "BINARY_OP_ADD_INT        0 (+)")
 
         co_unicode = compile('a + b', "<unicode>", "eval")
         self.code_quicken(lambda: exec(co_unicode, {}, {'a': 'a', 'b': 'b'}))
         got = self.get_disassembly(co_unicode, adaptive=True)
-        self.do_disassembly_compare(got, binary_op_quicken % "BINARY_OP_ADD_UNICODE    0 (+)", True)
+        self.do_disassembly_compare(got, binary_op_quicken % "BINARY_OP_ADD_UNICODE    0 (+)")
 
         binary_subscr_quicken = """\
-  0           0 RESUME_CHECK             0
+  0           RESUME_CHECK             0
 
-  1           2 LOAD_NAME                0 (a)
-              4 LOAD_CONST               0 (0)
-              6 %s
-             10 RETURN_VALUE
+  1           LOAD_NAME                0 (a)
+              LOAD_CONST               0 (0)
+              %s
+              RETURN_VALUE
 """
         co_list = compile('a[0]', "<list>", "eval")
         self.code_quicken(lambda: exec(co_list, {}, {'a': [0]}))
         got = self.get_disassembly(co_list, adaptive=True)
-        self.do_disassembly_compare(got, binary_subscr_quicken % "BINARY_SUBSCR_LIST_INT", True)
+        self.do_disassembly_compare(got, binary_subscr_quicken % "BINARY_SUBSCR_LIST_INT")
 
         co_dict = compile('a[0]', "<dict>", "eval")
         self.code_quicken(lambda: exec(co_dict, {}, {'a': {0: '1'}}))
         got = self.get_disassembly(co_dict, adaptive=True)
-        self.do_disassembly_compare(got, binary_subscr_quicken % "BINARY_SUBSCR_DICT", True)
+        self.do_disassembly_compare(got, binary_subscr_quicken % "BINARY_SUBSCR_DICT")
 
     @cpython_only
     @requires_specialization
     def test_load_attr_specialize(self):
         load_attr_quicken = """\
-  0           0 RESUME_CHECK             0
+  0           RESUME_CHECK             0
 
-  1           2 LOAD_CONST               0 ('a')
-              4 LOAD_ATTR_SLOT           0 (__class__)
-             24 RETURN_VALUE
+  1           LOAD_CONST               0 ('a')
+              LOAD_ATTR_SLOT           0 (__class__)
+              RETURN_VALUE
 """
         co = compile("'a'.__class__", "", "eval")
         self.code_quicken(lambda: exec(co, {}, {}))
         got = self.get_disassembly(co, adaptive=True)
-        self.do_disassembly_compare(got, load_attr_quicken, True)
+        self.do_disassembly_compare(got, load_attr_quicken)
 
     @cpython_only
     @requires_specialization
     def test_call_specialize(self):
         call_quicken = """\
-  0        RESUME_CHECK             0
+  0           RESUME_CHECK             0
 
-  1        LOAD_NAME                0 (str)
-           PUSH_NULL
-           LOAD_CONST               0 (1)
-           CALL_STR_1               1
-           RETURN_VALUE
+  1           LOAD_NAME                0 (str)
+              PUSH_NULL
+              LOAD_CONST               0 (1)
+              CALL_STR_1               1
+              RETURN_VALUE
 """
         co = compile("str(1)", "", "eval")
         self.code_quicken(lambda: exec(co, {}, {}))
@@ -1276,7 +1215,7 @@ def test_loop_quicken(self):
     @cpython_only
     def test_extended_arg_quick(self):
         got = self.get_disassembly(extended_arg_quick)
-        self.do_disassembly_compare(got, dis_extended_arg_quick_code, True)
+        self.do_disassembly_compare(got, dis_extended_arg_quick_code)
 
     def get_cached_values(self, quickened, adaptive):
         def f():
@@ -1328,14 +1267,16 @@ def f():
                 op_offset = inst.offset - 2
                 cache_offset = inst.offset
                 break
+            else:
+                opname = inst.opname
         else:
             self.fail("Can't find a CACHE entry in the function provided to do the test")
 
         assem_op = self.get_disassembly(f.__code__, lasti=op_offset, wrapper=False)
         assem_cache = self.get_disassembly(f.__code__, lasti=cache_offset, wrapper=False)
 
-        # Make sure --> exists and points to the correct offset
-        self.assertRegex(assem_op, fr"-->\s+{op_offset}")
+        # Make sure --> exists and points to the correct op
+        self.assertRegex(assem_op, fr"--> {opname}")
         # Make sure when lasti points to cache, it shows the same disassembly
         self.assertEqual(assem_op, assem_cache)
 
@@ -1637,197 +1578,197 @@ def _prepare_test_cases():
 Instruction = dis.Instruction
 
 expected_opinfo_outer = [
-  Instruction(opname='MAKE_CELL', opcode=94, arg=0, argval='a', argrepr='a', offset=0, start_offset=0, starts_line=True, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='MAKE_CELL', opcode=94, arg=1, argval='b', argrepr='b', offset=2, start_offset=2, starts_line=False, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='RESUME', opcode=149, arg=0, argval=0, argrepr='', offset=4, start_offset=4, starts_line=True, line_number=1, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=5, argval=(3, 4), argrepr='(3, 4)', offset=6, start_offset=6, starts_line=True, line_number=2, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='a', argrepr='a', offset=8, start_offset=8, starts_line=False, line_number=2, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=1, argval='b', argrepr='b', offset=10, start_offset=10, starts_line=False, line_number=2, is_jump_target=False, positions=None),
-  Instruction(opname='BUILD_TUPLE', opcode=52, arg=2, argval=2, argrepr='', offset=12, start_offset=12, starts_line=False, line_number=2, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=1, argval=code_object_f, argrepr=repr(code_object_f), offset=14, start_offset=14, starts_line=False, line_number=2, is_jump_target=False, positions=None),
-  Instruction(opname='MAKE_FUNCTION', opcode=26, arg=None, argval=None, argrepr='', offset=16, start_offset=16, starts_line=False, line_number=2, is_jump_target=False, positions=None),
-  Instruction(opname='SET_FUNCTION_ATTRIBUTE', opcode=106, arg=8, argval=8, argrepr='closure', offset=18, start_offset=18, starts_line=False, line_number=2, is_jump_target=False, positions=None),
-  Instruction(opname='SET_FUNCTION_ATTRIBUTE', opcode=106, arg=1, argval=1, argrepr='defaults', offset=20, start_offset=20, starts_line=False, line_number=2, is_jump_target=False, positions=None),
-  Instruction(opname='STORE_FAST', opcode=110, arg=2, argval='f', argrepr='f', offset=22, start_offset=22, starts_line=False, line_number=2, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=1, argval='print', argrepr='print + NULL', offset=24, start_offset=24, starts_line=True, line_number=7, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_DEREF', opcode=84, arg=0, argval='a', argrepr='a', offset=34, start_offset=34, starts_line=False, line_number=7, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_DEREF', opcode=84, arg=1, argval='b', argrepr='b', offset=36, start_offset=36, starts_line=False, line_number=7, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=2, argval='', argrepr="''", offset=38, start_offset=38, starts_line=False, line_number=7, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=3, argval=1, argrepr='1', offset=40, start_offset=40, starts_line=False, line_number=7, is_jump_target=False, positions=None),
-  Instruction(opname='BUILD_LIST', opcode=47, arg=0, argval=0, argrepr='', offset=42, start_offset=42, starts_line=False, line_number=7, is_jump_target=False, positions=None),
-  Instruction(opname='BUILD_MAP', opcode=48, arg=0, argval=0, argrepr='', offset=44, start_offset=44, starts_line=False, line_number=7, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=4, argval='Hello world!', argrepr="'Hello world!'", offset=46, start_offset=46, starts_line=False, line_number=7, is_jump_target=False, positions=None),
-  Instruction(opname='CALL', opcode=53, arg=7, argval=7, argrepr='', offset=48, start_offset=48, starts_line=False, line_number=7, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=56, start_offset=56, starts_line=False, line_number=7, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=2, argval='f', argrepr='f', offset=58, start_offset=58, starts_line=True, line_number=8, is_jump_target=False, positions=None),
-  Instruction(opname='RETURN_VALUE', opcode=36, arg=None, argval=None, argrepr='', offset=60, start_offset=60, starts_line=False, line_number=8, is_jump_target=False, positions=None),
+  Instruction(opname='MAKE_CELL', opcode=94, arg=0, argval='a', argrepr='a', offset=0, start_offset=0, starts_line=True, line_number=None, label=None, positions=None),
+  Instruction(opname='MAKE_CELL', opcode=94, arg=1, argval='b', argrepr='b', offset=2, start_offset=2, starts_line=False, line_number=None, label=None, positions=None),
+  Instruction(opname='RESUME', opcode=149, arg=0, argval=0, argrepr='', offset=4, start_offset=4, starts_line=True, line_number=1, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=5, argval=(3, 4), argrepr='(3, 4)', offset=6, start_offset=6, starts_line=True, line_number=2, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='a', argrepr='a', offset=8, start_offset=8, starts_line=False, line_number=2, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=1, argval='b', argrepr='b', offset=10, start_offset=10, starts_line=False, line_number=2, label=None, positions=None),
+  Instruction(opname='BUILD_TUPLE', opcode=52, arg=2, argval=2, argrepr='', offset=12, start_offset=12, starts_line=False, line_number=2, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=1, argval=code_object_f, argrepr=repr(code_object_f), offset=14, start_offset=14, starts_line=False, line_number=2, label=None, positions=None),
+  Instruction(opname='MAKE_FUNCTION', opcode=26, arg=None, argval=None, argrepr='', offset=16, start_offset=16, starts_line=False, line_number=2, label=None, positions=None),
+  Instruction(opname='SET_FUNCTION_ATTRIBUTE', opcode=106, arg=8, argval=8, argrepr='closure', offset=18, start_offset=18, starts_line=False, line_number=2, label=None, positions=None),
+  Instruction(opname='SET_FUNCTION_ATTRIBUTE', opcode=106, arg=1, argval=1, argrepr='defaults', offset=20, start_offset=20, starts_line=False, line_number=2, label=None, positions=None),
+  Instruction(opname='STORE_FAST', opcode=110, arg=2, argval='f', argrepr='f', offset=22, start_offset=22, starts_line=False, line_number=2, label=None, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=1, argval='print', argrepr='print + NULL', offset=24, start_offset=24, starts_line=True, line_number=7, label=None, positions=None),
+  Instruction(opname='LOAD_DEREF', opcode=84, arg=0, argval='a', argrepr='a', offset=34, start_offset=34, starts_line=False, line_number=7, label=None, positions=None),
+  Instruction(opname='LOAD_DEREF', opcode=84, arg=1, argval='b', argrepr='b', offset=36, start_offset=36, starts_line=False, line_number=7, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=2, argval='', argrepr="''", offset=38, start_offset=38, starts_line=False, line_number=7, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=3, argval=1, argrepr='1', offset=40, start_offset=40, starts_line=False, line_number=7, label=None, positions=None),
+  Instruction(opname='BUILD_LIST', opcode=47, arg=0, argval=0, argrepr='', offset=42, start_offset=42, starts_line=False, line_number=7, label=None, positions=None),
+  Instruction(opname='BUILD_MAP', opcode=48, arg=0, argval=0, argrepr='', offset=44, start_offset=44, starts_line=False, line_number=7, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=4, argval='Hello world!', argrepr="'Hello world!'", offset=46, start_offset=46, starts_line=False, line_number=7, label=None, positions=None),
+  Instruction(opname='CALL', opcode=53, arg=7, argval=7, argrepr='', offset=48, start_offset=48, starts_line=False, line_number=7, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=56, start_offset=56, starts_line=False, line_number=7, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=2, argval='f', argrepr='f', offset=58, start_offset=58, starts_line=True, line_number=8, label=None, positions=None),
+  Instruction(opname='RETURN_VALUE', opcode=36, arg=None, argval=None, argrepr='', offset=60, start_offset=60, starts_line=False, line_number=8, label=None, positions=None),
 ]
 
 expected_opinfo_f = [
-  Instruction(opname='COPY_FREE_VARS', opcode=62, arg=2, argval=2, argrepr='', offset=0, start_offset=0, starts_line=True, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='MAKE_CELL', opcode=94, arg=0, argval='c', argrepr='c', offset=2, start_offset=2, starts_line=False, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='MAKE_CELL', opcode=94, arg=1, argval='d', argrepr='d', offset=4, start_offset=4, starts_line=False, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='RESUME', opcode=149, arg=0, argval=0, argrepr='', offset=6, start_offset=6, starts_line=True, line_number=2, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=2, argval=(5, 6), argrepr='(5, 6)', offset=8, start_offset=8, starts_line=True, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=3, argval='a', argrepr='a', offset=10, start_offset=10, starts_line=False, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=4, argval='b', argrepr='b', offset=12, start_offset=12, starts_line=False, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='c', argrepr='c', offset=14, start_offset=14, starts_line=False, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=1, argval='d', argrepr='d', offset=16, start_offset=16, starts_line=False, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='BUILD_TUPLE', opcode=52, arg=4, argval=4, argrepr='', offset=18, start_offset=18, starts_line=False, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=1, argval=code_object_inner, argrepr=repr(code_object_inner), offset=20, start_offset=20, starts_line=False, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='MAKE_FUNCTION', opcode=26, arg=None, argval=None, argrepr='', offset=22, start_offset=22, starts_line=False, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='SET_FUNCTION_ATTRIBUTE', opcode=106, arg=8, argval=8, argrepr='closure', offset=24, start_offset=24, starts_line=False, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='SET_FUNCTION_ATTRIBUTE', opcode=106, arg=1, argval=1, argrepr='defaults', offset=26, start_offset=26, starts_line=False, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='STORE_FAST', opcode=110, arg=2, argval='inner', argrepr='inner', offset=28, start_offset=28, starts_line=False, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=1, argval='print', argrepr='print + NULL', offset=30, start_offset=30, starts_line=True, line_number=5, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_DEREF', opcode=84, arg=3, argval='a', argrepr='a', offset=40, start_offset=40, starts_line=False, line_number=5, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_DEREF', opcode=84, arg=4, argval='b', argrepr='b', offset=42, start_offset=42, starts_line=False, line_number=5, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_DEREF', opcode=84, arg=0, argval='c', argrepr='c', offset=44, start_offset=44, starts_line=False, line_number=5, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_DEREF', opcode=84, arg=1, argval='d', argrepr='d', offset=46, start_offset=46, starts_line=False, line_number=5, is_jump_target=False, positions=None),
-  Instruction(opname='CALL', opcode=53, arg=4, argval=4, argrepr='', offset=48, start_offset=48, starts_line=False, line_number=5, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=56, start_offset=56, starts_line=False, line_number=5, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=2, argval='inner', argrepr='inner', offset=58, start_offset=58, starts_line=True, line_number=6, is_jump_target=False, positions=None),
-  Instruction(opname='RETURN_VALUE', opcode=36, arg=None, argval=None, argrepr='', offset=60, start_offset=60, starts_line=False, line_number=6, is_jump_target=False, positions=None),
+  Instruction(opname='COPY_FREE_VARS', opcode=62, arg=2, argval=2, argrepr='', offset=0, start_offset=0, starts_line=True, line_number=None, label=None, positions=None),
+  Instruction(opname='MAKE_CELL', opcode=94, arg=0, argval='c', argrepr='c', offset=2, start_offset=2, starts_line=False, line_number=None, label=None, positions=None),
+  Instruction(opname='MAKE_CELL', opcode=94, arg=1, argval='d', argrepr='d', offset=4, start_offset=4, starts_line=False, line_number=None, label=None, positions=None),
+  Instruction(opname='RESUME', opcode=149, arg=0, argval=0, argrepr='', offset=6, start_offset=6, starts_line=True, line_number=2, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=2, argval=(5, 6), argrepr='(5, 6)', offset=8, start_offset=8, starts_line=True, line_number=3, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=3, argval='a', argrepr='a', offset=10, start_offset=10, starts_line=False, line_number=3, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=4, argval='b', argrepr='b', offset=12, start_offset=12, starts_line=False, line_number=3, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='c', argrepr='c', offset=14, start_offset=14, starts_line=False, line_number=3, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=1, argval='d', argrepr='d', offset=16, start_offset=16, starts_line=False, line_number=3, label=None, positions=None),
+  Instruction(opname='BUILD_TUPLE', opcode=52, arg=4, argval=4, argrepr='', offset=18, start_offset=18, starts_line=False, line_number=3, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=1, argval=code_object_inner, argrepr=repr(code_object_inner), offset=20, start_offset=20, starts_line=False, line_number=3, label=None, positions=None),
+  Instruction(opname='MAKE_FUNCTION', opcode=26, arg=None, argval=None, argrepr='', offset=22, start_offset=22, starts_line=False, line_number=3, label=None, positions=None),
+  Instruction(opname='SET_FUNCTION_ATTRIBUTE', opcode=106, arg=8, argval=8, argrepr='closure', offset=24, start_offset=24, starts_line=False, line_number=3, label=None, positions=None),
+  Instruction(opname='SET_FUNCTION_ATTRIBUTE', opcode=106, arg=1, argval=1, argrepr='defaults', offset=26, start_offset=26, starts_line=False, line_number=3, label=None, positions=None),
+  Instruction(opname='STORE_FAST', opcode=110, arg=2, argval='inner', argrepr='inner', offset=28, start_offset=28, starts_line=False, line_number=3, label=None, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=1, argval='print', argrepr='print + NULL', offset=30, start_offset=30, starts_line=True, line_number=5, label=None, positions=None),
+  Instruction(opname='LOAD_DEREF', opcode=84, arg=3, argval='a', argrepr='a', offset=40, start_offset=40, starts_line=False, line_number=5, label=None, positions=None),
+  Instruction(opname='LOAD_DEREF', opcode=84, arg=4, argval='b', argrepr='b', offset=42, start_offset=42, starts_line=False, line_number=5, label=None, positions=None),
+  Instruction(opname='LOAD_DEREF', opcode=84, arg=0, argval='c', argrepr='c', offset=44, start_offset=44, starts_line=False, line_number=5, label=None, positions=None),
+  Instruction(opname='LOAD_DEREF', opcode=84, arg=1, argval='d', argrepr='d', offset=46, start_offset=46, starts_line=False, line_number=5, label=None, positions=None),
+  Instruction(opname='CALL', opcode=53, arg=4, argval=4, argrepr='', offset=48, start_offset=48, starts_line=False, line_number=5, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=56, start_offset=56, starts_line=False, line_number=5, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=2, argval='inner', argrepr='inner', offset=58, start_offset=58, starts_line=True, line_number=6, label=None, positions=None),
+  Instruction(opname='RETURN_VALUE', opcode=36, arg=None, argval=None, argrepr='', offset=60, start_offset=60, starts_line=False, line_number=6, label=None, positions=None),
 ]
 
 expected_opinfo_inner = [
-  Instruction(opname='COPY_FREE_VARS', opcode=62, arg=4, argval=4, argrepr='', offset=0, start_offset=0, starts_line=True, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='RESUME', opcode=149, arg=0, argval=0, argrepr='', offset=2, start_offset=2, starts_line=True, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=1, argval='print', argrepr='print + NULL', offset=4, start_offset=4, starts_line=True, line_number=4, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_DEREF', opcode=84, arg=2, argval='a', argrepr='a', offset=14, start_offset=14, starts_line=False, line_number=4, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_DEREF', opcode=84, arg=3, argval='b', argrepr='b', offset=16, start_offset=16, starts_line=False, line_number=4, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_DEREF', opcode=84, arg=4, argval='c', argrepr='c', offset=18, start_offset=18, starts_line=False, line_number=4, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_DEREF', opcode=84, arg=5, argval='d', argrepr='d', offset=20, start_offset=20, starts_line=False, line_number=4, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST_LOAD_FAST', opcode=88, arg=1, argval=('e', 'f'), argrepr='e, f', offset=22, start_offset=22, starts_line=False, line_number=4, is_jump_target=False, positions=None),
-  Instruction(opname='CALL', opcode=53, arg=6, argval=6, argrepr='', offset=24, start_offset=24, starts_line=False, line_number=4, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=32, start_offset=32, starts_line=False, line_number=4, is_jump_target=False, positions=None),
-  Instruction(opname='RETURN_CONST', opcode=103, arg=0, argval=None, argrepr='None', offset=34, start_offset=34, starts_line=False, line_number=4, is_jump_target=False, positions=None),
+  Instruction(opname='COPY_FREE_VARS', opcode=62, arg=4, argval=4, argrepr='', offset=0, start_offset=0, starts_line=True, line_number=None, label=None, positions=None),
+  Instruction(opname='RESUME', opcode=149, arg=0, argval=0, argrepr='', offset=2, start_offset=2, starts_line=True, line_number=3, label=None, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=1, argval='print', argrepr='print + NULL', offset=4, start_offset=4, starts_line=True, line_number=4, label=None, positions=None),
+  Instruction(opname='LOAD_DEREF', opcode=84, arg=2, argval='a', argrepr='a', offset=14, start_offset=14, starts_line=False, line_number=4, label=None, positions=None),
+  Instruction(opname='LOAD_DEREF', opcode=84, arg=3, argval='b', argrepr='b', offset=16, start_offset=16, starts_line=False, line_number=4, label=None, positions=None),
+  Instruction(opname='LOAD_DEREF', opcode=84, arg=4, argval='c', argrepr='c', offset=18, start_offset=18, starts_line=False, line_number=4, label=None, positions=None),
+  Instruction(opname='LOAD_DEREF', opcode=84, arg=5, argval='d', argrepr='d', offset=20, start_offset=20, starts_line=False, line_number=4, label=None, positions=None),
+  Instruction(opname='LOAD_FAST_LOAD_FAST', opcode=88, arg=1, argval=('e', 'f'), argrepr='e, f', offset=22, start_offset=22, starts_line=False, line_number=4, label=None, positions=None),
+  Instruction(opname='CALL', opcode=53, arg=6, argval=6, argrepr='', offset=24, start_offset=24, starts_line=False, line_number=4, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=32, start_offset=32, starts_line=False, line_number=4, label=None, positions=None),
+  Instruction(opname='RETURN_CONST', opcode=103, arg=0, argval=None, argrepr='None', offset=34, start_offset=34, starts_line=False, line_number=4, label=None, positions=None),
 ]
 
 expected_opinfo_jumpy = [
-  Instruction(opname='RESUME', opcode=149, arg=0, argval=0, argrepr='', offset=0, start_offset=0, starts_line=True, line_number=1, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=1, argval='range', argrepr='range + NULL', offset=2, start_offset=2, starts_line=True, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=1, argval=10, argrepr='10', offset=12, start_offset=12, starts_line=False, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=14, start_offset=14, starts_line=False, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='GET_ITER', opcode=19, arg=None, argval=None, argrepr='', offset=22, start_offset=22, starts_line=False, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='FOR_ITER', opcode=72, arg=30, argval=88, argrepr='to 88', offset=24, start_offset=24, starts_line=False, line_number=3, is_jump_target=True, positions=None),
-  Instruction(opname='STORE_FAST', opcode=110, arg=0, argval='i', argrepr='i', offset=28, start_offset=28, starts_line=False, line_number=3, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=30, start_offset=30, starts_line=True, line_number=4, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=40, start_offset=40, starts_line=False, line_number=4, is_jump_target=False, positions=None),
-  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=42, start_offset=42, starts_line=False, line_number=4, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=50, start_offset=50, starts_line=False, line_number=4, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=52, start_offset=52, starts_line=True, line_number=5, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=2, argval=4, argrepr='4', offset=54, start_offset=54, starts_line=False, line_number=5, is_jump_target=False, positions=None),
-  Instruction(opname='COMPARE_OP', opcode=58, arg=18, argval='<', argrepr='bool(<)', offset=56, start_offset=56, starts_line=False, line_number=5, is_jump_target=False, positions=None),
-  Instruction(opname='POP_JUMP_IF_FALSE', opcode=97, arg=2, argval=68, argrepr='to 68', offset=60, start_offset=60, starts_line=False, line_number=5, is_jump_target=False, positions=None),
-  Instruction(opname='JUMP_BACKWARD', opcode=77, arg=22, argval=24, argrepr='to 24', offset=64, start_offset=64, starts_line=True, line_number=6, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=68, start_offset=68, starts_line=True, line_number=7, is_jump_target=True, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=3, argval=6, argrepr='6', offset=70, start_offset=70, starts_line=False, line_number=7, is_jump_target=False, positions=None),
-  Instruction(opname='COMPARE_OP', opcode=58, arg=148, argval='>', argrepr='bool(>)', offset=72, start_offset=72, starts_line=False, line_number=7, is_jump_target=False, positions=None),
-  Instruction(opname='POP_JUMP_IF_TRUE', opcode=100, arg=2, argval=84, argrepr='to 84', offset=76, start_offset=76, starts_line=False, line_number=7, is_jump_target=False, positions=None),
-  Instruction(opname='JUMP_BACKWARD', opcode=77, arg=30, argval=24, argrepr='to 24', offset=80, start_offset=80, starts_line=False, line_number=7, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=84, start_offset=84, starts_line=True, line_number=8, is_jump_target=True, positions=None),
-  Instruction(opname='JUMP_FORWARD', opcode=79, arg=12, argval=112, argrepr='to 112', offset=86, start_offset=86, starts_line=False, line_number=8, is_jump_target=False, positions=None),
-  Instruction(opname='END_FOR', opcode=11, arg=None, argval=None, argrepr='', offset=88, start_offset=88, starts_line=True, line_number=3, is_jump_target=True, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=90, start_offset=90, starts_line=True, line_number=10, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=4, argval='I can haz else clause?', argrepr="'I can haz else clause?'", offset=100, start_offset=100, starts_line=False, line_number=10, is_jump_target=False, positions=None),
-  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=102, start_offset=102, starts_line=False, line_number=10, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=110, start_offset=110, starts_line=False, line_number=10, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST_CHECK', opcode=87, arg=0, argval='i', argrepr='i', offset=112, start_offset=112, starts_line=True, line_number=11, is_jump_target=True, positions=None),
-  Instruction(opname='TO_BOOL', opcode=40, arg=None, argval=None, argrepr='', offset=114, start_offset=114, starts_line=False, line_number=11, is_jump_target=False, positions=None),
-  Instruction(opname='POP_JUMP_IF_FALSE', opcode=97, arg=40, argval=206, argrepr='to 206', offset=122, start_offset=122, starts_line=False, line_number=11, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=126, start_offset=126, starts_line=True, line_number=12, is_jump_target=True, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=136, start_offset=136, starts_line=False, line_number=12, is_jump_target=False, positions=None),
-  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=138, start_offset=138, starts_line=False, line_number=12, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=146, start_offset=146, starts_line=False, line_number=12, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=148, start_offset=148, starts_line=True, line_number=13, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=5, argval=1, argrepr='1', offset=150, start_offset=150, starts_line=False, line_number=13, is_jump_target=False, positions=None),
-  Instruction(opname='BINARY_OP', opcode=45, arg=23, argval=23, argrepr='-=', offset=152, start_offset=152, starts_line=False, line_number=13, is_jump_target=False, positions=None),
-  Instruction(opname='STORE_FAST', opcode=110, arg=0, argval='i', argrepr='i', offset=156, start_offset=156, starts_line=False, line_number=13, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=158, start_offset=158, starts_line=True, line_number=14, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=3, argval=6, argrepr='6', offset=160, start_offset=160, starts_line=False, line_number=14, is_jump_target=False, positions=None),
-  Instruction(opname='COMPARE_OP', opcode=58, arg=148, argval='>', argrepr='bool(>)', offset=162, start_offset=162, starts_line=False, line_number=14, is_jump_target=False, positions=None),
-  Instruction(opname='POP_JUMP_IF_FALSE', opcode=97, arg=2, argval=174, argrepr='to 174', offset=166, start_offset=166, starts_line=False, line_number=14, is_jump_target=False, positions=None),
-  Instruction(opname='JUMP_BACKWARD', opcode=77, arg=31, argval=112, argrepr='to 112', offset=170, start_offset=170, starts_line=True, line_number=15, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=174, start_offset=174, starts_line=True, line_number=16, is_jump_target=True, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=2, argval=4, argrepr='4', offset=176, start_offset=176, starts_line=False, line_number=16, is_jump_target=False, positions=None),
-  Instruction(opname='COMPARE_OP', opcode=58, arg=18, argval='<', argrepr='bool(<)', offset=178, start_offset=178, starts_line=False, line_number=16, is_jump_target=False, positions=None),
-  Instruction(opname='POP_JUMP_IF_FALSE', opcode=97, arg=1, argval=188, argrepr='to 188', offset=182, start_offset=182, starts_line=False, line_number=16, is_jump_target=False, positions=None),
-  Instruction(opname='JUMP_FORWARD', opcode=79, arg=20, argval=228, argrepr='to 228', offset=186, start_offset=186, starts_line=True, line_number=17, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=188, start_offset=188, starts_line=True, line_number=11, is_jump_target=True, positions=None),
-  Instruction(opname='TO_BOOL', opcode=40, arg=None, argval=None, argrepr='', offset=190, start_offset=190, starts_line=False, line_number=11, is_jump_target=False, positions=None),
-  Instruction(opname='POP_JUMP_IF_FALSE', opcode=97, arg=2, argval=206, argrepr='to 206', offset=198, start_offset=198, starts_line=False, line_number=11, is_jump_target=False, positions=None),
-  Instruction(opname='JUMP_BACKWARD', opcode=77, arg=40, argval=126, argrepr='to 126', offset=202, start_offset=202, starts_line=False, line_number=11, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=206, start_offset=206, starts_line=True, line_number=19, is_jump_target=True, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=216, start_offset=216, starts_line=False, line_number=19, is_jump_target=False, positions=None),
-  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=218, start_offset=218, starts_line=False, line_number=19, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=226, start_offset=226, starts_line=False, line_number=19, is_jump_target=False, positions=None),
-  Instruction(opname='NOP', opcode=30, arg=None, argval=None, argrepr='', offset=228, start_offset=228, starts_line=True, line_number=20, is_jump_target=True, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=5, argval=1, argrepr='1', offset=230, start_offset=230, starts_line=True, line_number=21, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=7, argval=0, argrepr='0', offset=232, start_offset=232, starts_line=False, line_number=21, is_jump_target=False, positions=None),
-  Instruction(opname='BINARY_OP', opcode=45, arg=11, argval=11, argrepr='/', offset=234, start_offset=234, starts_line=False, line_number=21, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=238, start_offset=238, starts_line=False, line_number=21, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=240, start_offset=240, starts_line=True, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='BEFORE_WITH', opcode=2, arg=None, argval=None, argrepr='', offset=242, start_offset=242, starts_line=False, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='STORE_FAST', opcode=110, arg=1, argval='dodgy', argrepr='dodgy', offset=244, start_offset=244, starts_line=False, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=246, start_offset=246, starts_line=True, line_number=26, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=8, argval='Never reach this', argrepr="'Never reach this'", offset=256, start_offset=256, starts_line=False, line_number=26, is_jump_target=False, positions=None),
-  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=258, start_offset=258, starts_line=False, line_number=26, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=266, start_offset=266, starts_line=False, line_number=26, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=0, argval=None, argrepr='None', offset=268, start_offset=268, starts_line=True, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=0, argval=None, argrepr='None', offset=270, start_offset=270, starts_line=False, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=0, argval=None, argrepr='None', offset=272, start_offset=272, starts_line=False, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='CALL', opcode=53, arg=2, argval=2, argrepr='', offset=274, start_offset=274, starts_line=False, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=282, start_offset=282, starts_line=False, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=284, start_offset=284, starts_line=True, line_number=28, is_jump_target=True, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=294, start_offset=294, starts_line=False, line_number=28, is_jump_target=False, positions=None),
-  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=296, start_offset=296, starts_line=False, line_number=28, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=304, start_offset=304, starts_line=False, line_number=28, is_jump_target=False, positions=None),
-  Instruction(opname='RETURN_CONST', opcode=103, arg=0, argval=None, argrepr='None', offset=306, start_offset=306, starts_line=False, line_number=28, is_jump_target=False, positions=None),
-  Instruction(opname='PUSH_EXC_INFO', opcode=33, arg=None, argval=None, argrepr='', offset=308, start_offset=308, starts_line=True, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='WITH_EXCEPT_START', opcode=44, arg=None, argval=None, argrepr='', offset=310, start_offset=310, starts_line=False, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='TO_BOOL', opcode=40, arg=None, argval=None, argrepr='', offset=312, start_offset=312, starts_line=False, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='POP_JUMP_IF_TRUE', opcode=100, arg=1, argval=326, argrepr='to 326', offset=320, start_offset=320, starts_line=False, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='RERAISE', opcode=102, arg=2, argval=2, argrepr='', offset=324, start_offset=324, starts_line=False, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=326, start_offset=326, starts_line=False, line_number=25, is_jump_target=True, positions=None),
-  Instruction(opname='POP_EXCEPT', opcode=31, arg=None, argval=None, argrepr='', offset=328, start_offset=328, starts_line=False, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=330, start_offset=330, starts_line=False, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=332, start_offset=332, starts_line=False, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='JUMP_BACKWARD', opcode=77, arg=27, argval=284, argrepr='to 284', offset=334, start_offset=334, starts_line=False, line_number=25, is_jump_target=False, positions=None),
-  Instruction(opname='COPY', opcode=61, arg=3, argval=3, argrepr='', offset=338, start_offset=338, starts_line=True, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_EXCEPT', opcode=31, arg=None, argval=None, argrepr='', offset=340, start_offset=340, starts_line=False, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='RERAISE', opcode=102, arg=1, argval=1, argrepr='', offset=342, start_offset=342, starts_line=False, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='PUSH_EXC_INFO', opcode=33, arg=None, argval=None, argrepr='', offset=344, start_offset=344, starts_line=False, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=4, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=346, start_offset=346, starts_line=True, line_number=22, is_jump_target=False, positions=None),
-  Instruction(opname='CHECK_EXC_MATCH', opcode=7, arg=None, argval=None, argrepr='', offset=356, start_offset=356, starts_line=False, line_number=22, is_jump_target=False, positions=None),
-  Instruction(opname='POP_JUMP_IF_FALSE', opcode=97, arg=15, argval=392, argrepr='to 392', offset=358, start_offset=358, starts_line=False, line_number=22, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=362, start_offset=362, starts_line=False, line_number=22, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=364, start_offset=364, starts_line=True, line_number=23, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=9, argval='Here we go, here we go, here we go...', argrepr="'Here we go, here we go, here we go...'", offset=374, start_offset=374, starts_line=False, line_number=23, is_jump_target=False, positions=None),
-  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=376, start_offset=376, starts_line=False, line_number=23, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=384, start_offset=384, starts_line=False, line_number=23, is_jump_target=False, positions=None),
-  Instruction(opname='POP_EXCEPT', opcode=31, arg=None, argval=None, argrepr='', offset=386, start_offset=386, starts_line=False, line_number=23, is_jump_target=False, positions=None),
-  Instruction(opname='JUMP_BACKWARD', opcode=77, arg=54, argval=284, argrepr='to 284', offset=388, start_offset=388, starts_line=False, line_number=23, is_jump_target=False, positions=None),
-  Instruction(opname='RERAISE', opcode=102, arg=0, argval=0, argrepr='', offset=392, start_offset=392, starts_line=True, line_number=22, is_jump_target=True, positions=None),
-  Instruction(opname='COPY', opcode=61, arg=3, argval=3, argrepr='', offset=394, start_offset=394, starts_line=True, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_EXCEPT', opcode=31, arg=None, argval=None, argrepr='', offset=396, start_offset=396, starts_line=False, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='RERAISE', opcode=102, arg=1, argval=1, argrepr='', offset=398, start_offset=398, starts_line=False, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='PUSH_EXC_INFO', opcode=33, arg=None, argval=None, argrepr='', offset=400, start_offset=400, starts_line=False, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=402, start_offset=402, starts_line=True, line_number=28, is_jump_target=False, positions=None),
-  Instruction(opname='LOAD_CONST', opcode=83, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=412, start_offset=412, starts_line=False, line_number=28, is_jump_target=False, positions=None),
-  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=414, start_offset=414, starts_line=False, line_number=28, is_jump_target=False, positions=None),
-  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=422, start_offset=422, starts_line=False, line_number=28, is_jump_target=False, positions=None),
-  Instruction(opname='RERAISE', opcode=102, arg=0, argval=0, argrepr='', offset=424, start_offset=424, starts_line=False, line_number=28, is_jump_target=False, positions=None),
-  Instruction(opname='COPY', opcode=61, arg=3, argval=3, argrepr='', offset=426, start_offset=426, starts_line=True, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='POP_EXCEPT', opcode=31, arg=None, argval=None, argrepr='', offset=428, start_offset=428, starts_line=False, line_number=None, is_jump_target=False, positions=None),
-  Instruction(opname='RERAISE', opcode=102, arg=1, argval=1, argrepr='', offset=430, start_offset=430, starts_line=False, line_number=None, is_jump_target=False, positions=None),
+  Instruction(opname='RESUME', opcode=149, arg=0, argval=0, argrepr='', offset=0, start_offset=0, starts_line=True, line_number=1, label=None, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=1, argval='range', argrepr='range + NULL', offset=2, start_offset=2, starts_line=True, line_number=3, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=1, argval=10, argrepr='10', offset=12, start_offset=12, starts_line=False, line_number=3, label=None, positions=None),
+  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=14, start_offset=14, starts_line=False, line_number=3, label=None, positions=None),
+  Instruction(opname='GET_ITER', opcode=19, arg=None, argval=None, argrepr='', offset=22, start_offset=22, starts_line=False, line_number=3, label=None, positions=None),
+  Instruction(opname='FOR_ITER', opcode=72, arg=30, argval=88, argrepr='to L4', offset=24, start_offset=24, starts_line=False, line_number=3, label=1, positions=None),
+  Instruction(opname='STORE_FAST', opcode=110, arg=0, argval='i', argrepr='i', offset=28, start_offset=28, starts_line=False, line_number=3, label=None, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=30, start_offset=30, starts_line=True, line_number=4, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=40, start_offset=40, starts_line=False, line_number=4, label=None, positions=None),
+  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=42, start_offset=42, starts_line=False, line_number=4, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=50, start_offset=50, starts_line=False, line_number=4, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=52, start_offset=52, starts_line=True, line_number=5, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=2, argval=4, argrepr='4', offset=54, start_offset=54, starts_line=False, line_number=5, label=None, positions=None),
+  Instruction(opname='COMPARE_OP', opcode=58, arg=18, argval='<', argrepr='bool(<)', offset=56, start_offset=56, starts_line=False, line_number=5, label=None, positions=None),
+  Instruction(opname='POP_JUMP_IF_FALSE', opcode=97, arg=2, argval=68, argrepr='to L2', offset=60, start_offset=60, starts_line=False, line_number=5, label=None, positions=None),
+  Instruction(opname='JUMP_BACKWARD', opcode=77, arg=22, argval=24, argrepr='to L1', offset=64, start_offset=64, starts_line=True, line_number=6, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=68, start_offset=68, starts_line=True, line_number=7, label=2, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=3, argval=6, argrepr='6', offset=70, start_offset=70, starts_line=False, line_number=7, label=None, positions=None),
+  Instruction(opname='COMPARE_OP', opcode=58, arg=148, argval='>', argrepr='bool(>)', offset=72, start_offset=72, starts_line=False, line_number=7, label=None, positions=None),
+  Instruction(opname='POP_JUMP_IF_TRUE', opcode=100, arg=2, argval=84, argrepr='to L3', offset=76, start_offset=76, starts_line=False, line_number=7, label=None, positions=None),
+  Instruction(opname='JUMP_BACKWARD', opcode=77, arg=30, argval=24, argrepr='to L1', offset=80, start_offset=80, starts_line=False, line_number=7, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=84, start_offset=84, starts_line=True, line_number=8, label=3, positions=None),
+  Instruction(opname='JUMP_FORWARD', opcode=79, arg=12, argval=112, argrepr='to L5', offset=86, start_offset=86, starts_line=False, line_number=8, label=None, positions=None),
+  Instruction(opname='END_FOR', opcode=11, arg=None, argval=None, argrepr='', offset=88, start_offset=88, starts_line=True, line_number=3, label=4, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=90, start_offset=90, starts_line=True, line_number=10, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=4, argval='I can haz else clause?', argrepr="'I can haz else clause?'", offset=100, start_offset=100, starts_line=False, line_number=10, label=None, positions=None),
+  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=102, start_offset=102, starts_line=False, line_number=10, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=110, start_offset=110, starts_line=False, line_number=10, label=None, positions=None),
+  Instruction(opname='LOAD_FAST_CHECK', opcode=87, arg=0, argval='i', argrepr='i', offset=112, start_offset=112, starts_line=True, line_number=11, label=5, positions=None),
+  Instruction(opname='TO_BOOL', opcode=40, arg=None, argval=None, argrepr='', offset=114, start_offset=114, starts_line=False, line_number=11, label=None, positions=None),
+  Instruction(opname='POP_JUMP_IF_FALSE', opcode=97, arg=40, argval=206, argrepr='to L9', offset=122, start_offset=122, starts_line=False, line_number=11, label=None, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=126, start_offset=126, starts_line=True, line_number=12, label=6, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=136, start_offset=136, starts_line=False, line_number=12, label=None, positions=None),
+  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=138, start_offset=138, starts_line=False, line_number=12, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=146, start_offset=146, starts_line=False, line_number=12, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=148, start_offset=148, starts_line=True, line_number=13, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=5, argval=1, argrepr='1', offset=150, start_offset=150, starts_line=False, line_number=13, label=None, positions=None),
+  Instruction(opname='BINARY_OP', opcode=45, arg=23, argval=23, argrepr='-=', offset=152, start_offset=152, starts_line=False, line_number=13, label=None, positions=None),
+  Instruction(opname='STORE_FAST', opcode=110, arg=0, argval='i', argrepr='i', offset=156, start_offset=156, starts_line=False, line_number=13, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=158, start_offset=158, starts_line=True, line_number=14, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=3, argval=6, argrepr='6', offset=160, start_offset=160, starts_line=False, line_number=14, label=None, positions=None),
+  Instruction(opname='COMPARE_OP', opcode=58, arg=148, argval='>', argrepr='bool(>)', offset=162, start_offset=162, starts_line=False, line_number=14, label=None, positions=None),
+  Instruction(opname='POP_JUMP_IF_FALSE', opcode=97, arg=2, argval=174, argrepr='to L7', offset=166, start_offset=166, starts_line=False, line_number=14, label=None, positions=None),
+  Instruction(opname='JUMP_BACKWARD', opcode=77, arg=31, argval=112, argrepr='to L5', offset=170, start_offset=170, starts_line=True, line_number=15, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=174, start_offset=174, starts_line=True, line_number=16, label=7, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=2, argval=4, argrepr='4', offset=176, start_offset=176, starts_line=False, line_number=16, label=None, positions=None),
+  Instruction(opname='COMPARE_OP', opcode=58, arg=18, argval='<', argrepr='bool(<)', offset=178, start_offset=178, starts_line=False, line_number=16, label=None, positions=None),
+  Instruction(opname='POP_JUMP_IF_FALSE', opcode=97, arg=1, argval=188, argrepr='to L8', offset=182, start_offset=182, starts_line=False, line_number=16, label=None, positions=None),
+  Instruction(opname='JUMP_FORWARD', opcode=79, arg=20, argval=228, argrepr='to L10', offset=186, start_offset=186, starts_line=True, line_number=17, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=188, start_offset=188, starts_line=True, line_number=11, label=8, positions=None),
+  Instruction(opname='TO_BOOL', opcode=40, arg=None, argval=None, argrepr='', offset=190, start_offset=190, starts_line=False, line_number=11, label=None, positions=None),
+  Instruction(opname='POP_JUMP_IF_FALSE', opcode=97, arg=2, argval=206, argrepr='to L9', offset=198, start_offset=198, starts_line=False, line_number=11, label=None, positions=None),
+  Instruction(opname='JUMP_BACKWARD', opcode=77, arg=40, argval=126, argrepr='to L6', offset=202, start_offset=202, starts_line=False, line_number=11, label=None, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=206, start_offset=206, starts_line=True, line_number=19, label=9, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=216, start_offset=216, starts_line=False, line_number=19, label=None, positions=None),
+  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=218, start_offset=218, starts_line=False, line_number=19, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=226, start_offset=226, starts_line=False, line_number=19, label=None, positions=None),
+  Instruction(opname='NOP', opcode=30, arg=None, argval=None, argrepr='', offset=228, start_offset=228, starts_line=True, line_number=20, label=10, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=5, argval=1, argrepr='1', offset=230, start_offset=230, starts_line=True, line_number=21, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=7, argval=0, argrepr='0', offset=232, start_offset=232, starts_line=False, line_number=21, label=None, positions=None),
+  Instruction(opname='BINARY_OP', opcode=45, arg=11, argval=11, argrepr='/', offset=234, start_offset=234, starts_line=False, line_number=21, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=238, start_offset=238, starts_line=False, line_number=21, label=None, positions=None),
+  Instruction(opname='LOAD_FAST', opcode=85, arg=0, argval='i', argrepr='i', offset=240, start_offset=240, starts_line=True, line_number=25, label=None, positions=None),
+  Instruction(opname='BEFORE_WITH', opcode=2, arg=None, argval=None, argrepr='', offset=242, start_offset=242, starts_line=False, line_number=25, label=None, positions=None),
+  Instruction(opname='STORE_FAST', opcode=110, arg=1, argval='dodgy', argrepr='dodgy', offset=244, start_offset=244, starts_line=False, line_number=25, label=None, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=246, start_offset=246, starts_line=True, line_number=26, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=8, argval='Never reach this', argrepr="'Never reach this'", offset=256, start_offset=256, starts_line=False, line_number=26, label=None, positions=None),
+  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=258, start_offset=258, starts_line=False, line_number=26, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=266, start_offset=266, starts_line=False, line_number=26, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=0, argval=None, argrepr='None', offset=268, start_offset=268, starts_line=True, line_number=25, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=0, argval=None, argrepr='None', offset=270, start_offset=270, starts_line=False, line_number=25, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=0, argval=None, argrepr='None', offset=272, start_offset=272, starts_line=False, line_number=25, label=None, positions=None),
+  Instruction(opname='CALL', opcode=53, arg=2, argval=2, argrepr='', offset=274, start_offset=274, starts_line=False, line_number=25, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=282, start_offset=282, starts_line=False, line_number=25, label=None, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=284, start_offset=284, starts_line=True, line_number=28, label=11, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=294, start_offset=294, starts_line=False, line_number=28, label=None, positions=None),
+  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=296, start_offset=296, starts_line=False, line_number=28, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=304, start_offset=304, starts_line=False, line_number=28, label=None, positions=None),
+  Instruction(opname='RETURN_CONST', opcode=103, arg=0, argval=None, argrepr='None', offset=306, start_offset=306, starts_line=False, line_number=28, label=None, positions=None),
+  Instruction(opname='PUSH_EXC_INFO', opcode=33, arg=None, argval=None, argrepr='', offset=308, start_offset=308, starts_line=True, line_number=25, label=None, positions=None),
+  Instruction(opname='WITH_EXCEPT_START', opcode=44, arg=None, argval=None, argrepr='', offset=310, start_offset=310, starts_line=False, line_number=25, label=None, positions=None),
+  Instruction(opname='TO_BOOL', opcode=40, arg=None, argval=None, argrepr='', offset=312, start_offset=312, starts_line=False, line_number=25, label=None, positions=None),
+  Instruction(opname='POP_JUMP_IF_TRUE', opcode=100, arg=1, argval=326, argrepr='to L12', offset=320, start_offset=320, starts_line=False, line_number=25, label=None, positions=None),
+  Instruction(opname='RERAISE', opcode=102, arg=2, argval=2, argrepr='', offset=324, start_offset=324, starts_line=False, line_number=25, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=326, start_offset=326, starts_line=False, line_number=25, label=12, positions=None),
+  Instruction(opname='POP_EXCEPT', opcode=31, arg=None, argval=None, argrepr='', offset=328, start_offset=328, starts_line=False, line_number=25, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=330, start_offset=330, starts_line=False, line_number=25, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=332, start_offset=332, starts_line=False, line_number=25, label=None, positions=None),
+  Instruction(opname='JUMP_BACKWARD', opcode=77, arg=27, argval=284, argrepr='to L11', offset=334, start_offset=334, starts_line=False, line_number=25, label=None, positions=None),
+  Instruction(opname='COPY', opcode=61, arg=3, argval=3, argrepr='', offset=338, start_offset=338, starts_line=True, line_number=None, label=None, positions=None),
+  Instruction(opname='POP_EXCEPT', opcode=31, arg=None, argval=None, argrepr='', offset=340, start_offset=340, starts_line=False, line_number=None, label=None, positions=None),
+  Instruction(opname='RERAISE', opcode=102, arg=1, argval=1, argrepr='', offset=342, start_offset=342, starts_line=False, line_number=None, label=None, positions=None),
+  Instruction(opname='PUSH_EXC_INFO', opcode=33, arg=None, argval=None, argrepr='', offset=344, start_offset=344, starts_line=False, line_number=None, label=None, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=4, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=346, start_offset=346, starts_line=True, line_number=22, label=None, positions=None),
+  Instruction(opname='CHECK_EXC_MATCH', opcode=7, arg=None, argval=None, argrepr='', offset=356, start_offset=356, starts_line=False, line_number=22, label=None, positions=None),
+  Instruction(opname='POP_JUMP_IF_FALSE', opcode=97, arg=15, argval=392, argrepr='to L13', offset=358, start_offset=358, starts_line=False, line_number=22, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=362, start_offset=362, starts_line=False, line_number=22, label=None, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=364, start_offset=364, starts_line=True, line_number=23, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=9, argval='Here we go, here we go, here we go...', argrepr="'Here we go, here we go, here we go...'", offset=374, start_offset=374, starts_line=False, line_number=23, label=None, positions=None),
+  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=376, start_offset=376, starts_line=False, line_number=23, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=384, start_offset=384, starts_line=False, line_number=23, label=None, positions=None),
+  Instruction(opname='POP_EXCEPT', opcode=31, arg=None, argval=None, argrepr='', offset=386, start_offset=386, starts_line=False, line_number=23, label=None, positions=None),
+  Instruction(opname='JUMP_BACKWARD', opcode=77, arg=54, argval=284, argrepr='to L11', offset=388, start_offset=388, starts_line=False, line_number=23, label=None, positions=None),
+  Instruction(opname='RERAISE', opcode=102, arg=0, argval=0, argrepr='', offset=392, start_offset=392, starts_line=True, line_number=22, label=13, positions=None),
+  Instruction(opname='COPY', opcode=61, arg=3, argval=3, argrepr='', offset=394, start_offset=394, starts_line=True, line_number=None, label=None, positions=None),
+  Instruction(opname='POP_EXCEPT', opcode=31, arg=None, argval=None, argrepr='', offset=396, start_offset=396, starts_line=False, line_number=None, label=None, positions=None),
+  Instruction(opname='RERAISE', opcode=102, arg=1, argval=1, argrepr='', offset=398, start_offset=398, starts_line=False, line_number=None, label=None, positions=None),
+  Instruction(opname='PUSH_EXC_INFO', opcode=33, arg=None, argval=None, argrepr='', offset=400, start_offset=400, starts_line=False, line_number=None, label=None, positions=None),
+  Instruction(opname='LOAD_GLOBAL', opcode=91, arg=3, argval='print', argrepr='print + NULL', offset=402, start_offset=402, starts_line=True, line_number=28, label=None, positions=None),
+  Instruction(opname='LOAD_CONST', opcode=83, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=412, start_offset=412, starts_line=False, line_number=28, label=None, positions=None),
+  Instruction(opname='CALL', opcode=53, arg=1, argval=1, argrepr='', offset=414, start_offset=414, starts_line=False, line_number=28, label=None, positions=None),
+  Instruction(opname='POP_TOP', opcode=32, arg=None, argval=None, argrepr='', offset=422, start_offset=422, starts_line=False, line_number=28, label=None, positions=None),
+  Instruction(opname='RERAISE', opcode=102, arg=0, argval=0, argrepr='', offset=424, start_offset=424, starts_line=False, line_number=28, label=None, positions=None),
+  Instruction(opname='COPY', opcode=61, arg=3, argval=3, argrepr='', offset=426, start_offset=426, starts_line=True, line_number=None, label=None, positions=None),
+  Instruction(opname='POP_EXCEPT', opcode=31, arg=None, argval=None, argrepr='', offset=428, start_offset=428, starts_line=False, line_number=None, label=None, positions=None),
+  Instruction(opname='RERAISE', opcode=102, arg=1, argval=1, argrepr='', offset=430, start_offset=430, starts_line=False, line_number=None, label=None, positions=None),
 ]
 
 # One last piece of inspect fodder to check the default line number handling
 def simple(): pass
 expected_opinfo_simple = [
-  Instruction(opname='RESUME', opcode=149, arg=0, argval=0, argrepr='', offset=0, start_offset=0, starts_line=True, line_number=simple.__code__.co_firstlineno, is_jump_target=False, positions=None),
-  Instruction(opname='RETURN_CONST', opcode=103, arg=0, argval=None, argrepr='None', offset=2, start_offset=2, starts_line=False, line_number=simple.__code__.co_firstlineno, is_jump_target=False),
+  Instruction(opname='RESUME', opcode=149, arg=0, argval=0, argrepr='', offset=0, start_offset=0, starts_line=True, line_number=simple.__code__.co_firstlineno, label=None, positions=None),
+  Instruction(opname='RETURN_CONST', opcode=103, arg=0, argval=None, argrepr='None', offset=2, start_offset=2, starts_line=False, line_number=simple.__code__.co_firstlineno, label=None),
 ]
 
 
@@ -1951,7 +1892,7 @@ def roots(a, b, c):
 
     def test_oparg_alias(self):
         instruction = Instruction(opname="NOP", opcode=dis.opmap["NOP"], arg=None, argval=None,
-                                  argrepr='', offset=10, start_offset=10, starts_line=True, line_number=1, is_jump_target=False,
+                                  argrepr='', offset=10, start_offset=10, starts_line=True, line_number=1, label=None,
                                   positions=None)
         self.assertEqual(instruction.arg, instruction.oparg)
 
@@ -1959,7 +1900,7 @@ def test_baseopname_and_baseopcode(self):
         # Standard instructions
         for name, code in dis.opmap.items():
             instruction = Instruction(opname=name, opcode=code, arg=None, argval=None, argrepr='', offset=0,
-                                      start_offset=0, starts_line=True, line_number=1, is_jump_target=False, positions=None)
+                                      start_offset=0, starts_line=True, line_number=1, label=None, positions=None)
             baseopname = instruction.baseopname
             baseopcode = instruction.baseopcode
             self.assertIsNotNone(baseopname)
@@ -1970,7 +1911,7 @@ def test_baseopname_and_baseopcode(self):
         # Specialized instructions
         for name in opcode._specialized_opmap:
             instruction = Instruction(opname=name, opcode=dis._all_opmap[name], arg=None, argval=None, argrepr='',
-                                      offset=0, start_offset=0, starts_line=True, line_number=1, is_jump_target=False, positions=None)
+                                      offset=0, start_offset=0, starts_line=True, line_number=1, label=None, positions=None)
             baseopname = instruction.baseopname
             baseopcode = instruction.baseopcode
             self.assertIn(name, opcode._specializations[baseopname])
@@ -1979,30 +1920,32 @@ def test_baseopname_and_baseopcode(self):
     def test_jump_target(self):
         # Non-jump instructions should return None
         instruction = Instruction(opname="NOP", opcode=dis.opmap["NOP"], arg=None, argval=None,
-                                  argrepr='', offset=10, start_offset=10, starts_line=True, line_number=1, is_jump_target=False,
+                                  argrepr='', offset=10, start_offset=10, starts_line=True, line_number=1, label=None,
                                   positions=None)
         self.assertIsNone(instruction.jump_target)
 
         delta = 100
         instruction = Instruction(opname="JUMP_FORWARD", opcode=dis.opmap["JUMP_FORWARD"], arg=delta, argval=delta,
-                                  argrepr='', offset=10, start_offset=10, starts_line=True, line_number=1, is_jump_target=False,
+                                  argrepr='', offset=10, start_offset=10, starts_line=True, line_number=1, label=None,
                                   positions=None)
         self.assertEqual(10 + 2 + 100*2, instruction.jump_target)
 
         # Test negative deltas
         instruction = Instruction(opname="JUMP_BACKWARD", opcode=dis.opmap["JUMP_BACKWARD"], arg=delta, argval=delta,
-                                  argrepr='', offset=200, start_offset=200, starts_line=True, line_number=1, is_jump_target=False,
+                                  argrepr='', offset=200, start_offset=200, starts_line=True, line_number=1, label=None,
                                   positions=None)
         self.assertEqual(200 + 2 - 100*2 + 2*1, instruction.jump_target)
 
         # Make sure cache entries are handled
         instruction = Instruction(opname="SEND", opcode=dis.opmap["SEND"], arg=delta, argval=delta,
-                                  argrepr='', offset=10, start_offset=10, starts_line=True, line_number=1, is_jump_target=False,
+                                  argrepr='', offset=10, start_offset=10, starts_line=True, line_number=1, label=None,
                                   positions=None)
         self.assertEqual(10 + 2 + 1*2 + 100*2, instruction.jump_target)
 
     def test_argval_argrepr(self):
-        f = dis.Instruction._get_argval_argrepr
+        def f(*args):
+            return dis.Instruction._get_argval_argrepr(
+                *args, labels_map={24: 1})
 
         offset = 42
         co_consts = (0, 1, 2, 3)
@@ -2012,7 +1955,7 @@ def test_argval_argrepr(self):
         self.assertEqual(f(opcode.opmap["POP_TOP"], None, *args), (None, ''))
         self.assertEqual(f(opcode.opmap["LOAD_CONST"], 1, *args), (1, '1'))
         self.assertEqual(f(opcode.opmap["LOAD_GLOBAL"], 2, *args), ('a', 'a'))
-        self.assertEqual(f(opcode.opmap["JUMP_BACKWARD"], 11, *args), (24, 'to 24'))
+        self.assertEqual(f(opcode.opmap["JUMP_BACKWARD"], 11, *args), (24, 'to L1'))
         self.assertEqual(f(opcode.opmap["COMPARE_OP"], 3, *args), ('<', '<'))
         self.assertEqual(f(opcode.opmap["SET_FUNCTION_ATTRIBUTE"], 2, *args), (2, 'kwdefaults'))
         self.assertEqual(f(opcode.opmap["BINARY_OP"], 3, *args), (3, '<<'))
@@ -2149,7 +2092,7 @@ def test_from_traceback_dis(self):
         self.maxDiff = None
         tb = get_tb()
         b = dis.Bytecode.from_traceback(tb)
-        self.assertEqual(self.strip_offsets(b.dis()), dis_traceback)
+        self.assertEqual(b.dis(), dis_traceback)
 
     @requires_debug_ranges()
     def test_bytecode_co_positions(self):
diff --git a/Misc/NEWS.d/next/Library/2023-11-16-17-18-09.gh-issue-112137.QvjGjN.rst b/Misc/NEWS.d/next/Library/2023-11-16-17-18-09.gh-issue-112137.QvjGjN.rst
new file mode 100644
index 00000000000000..6b61d051966846
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-11-16-17-18-09.gh-issue-112137.QvjGjN.rst
@@ -0,0 +1 @@
+Change :mod:`dis` output to display logical labels for jump targets instead of offsets.

From 14e539f0977aaf2768c58f1dcbbbab5ad0205ec5 Mon Sep 17 00:00:00 2001
From: Nikita Sobolev <mail@sobolevn.me>
Date: Thu, 23 Nov 2023 01:55:25 +0300
Subject: [PATCH 06/18] gh-111809: Fix `test_deep_repr` from `test_userdict` on
 WASI (GH-112229)

---
 Lib/test/test_userdict.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Lib/test/test_userdict.py b/Lib/test/test_userdict.py
index 483910aaa4620e..9a03f2d04ce970 100644
--- a/Lib/test/test_userdict.py
+++ b/Lib/test/test_userdict.py
@@ -1,6 +1,6 @@
 # Check every path through every method of UserDict
 
-from test import mapping_tests
+from test import mapping_tests, support
 import unittest
 import collections
 
@@ -213,6 +213,11 @@ class G(collections.UserDict):
         else:
             self.fail("g[42] didn't raise KeyError")
 
+    # Decorate existing test with recursion limit, because
+    # the test is for C structure, but `UserDict` is a Python structure.
+    test_repr_deep = support.infinite_recursion()(
+        mapping_tests.TestHashMappingProtocol.test_repr_deep,
+    )
 
 
 if __name__ == "__main__":

From 9e56eedd018e1a4681789e634016cbb7699dcb8a Mon Sep 17 00:00:00 2001
From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Wed, 22 Nov 2023 17:55:00 -0700
Subject: [PATCH 07/18] gh-76785: Return an "excinfo" Object From
 Interpreter.run() (gh-111573)

---
 Include/internal/pycore_crossinterp.h |  33 +-
 Lib/test/support/interpreters.py      |  18 +-
 Lib/test/test__xxinterpchannels.py    |  12 +-
 Lib/test/test__xxsubinterpreters.py   |  19 +-
 Lib/test/test_import/__init__.py      |  10 +-
 Lib/test/test_importlib/test_util.py  |  22 +-
 Lib/test/test_interpreters.py         |   5 +
 Modules/_xxsubinterpretersmodule.c    |  94 ++----
 Python/crossinterp.c                  | 448 +++++++++++++++++++-------
 9 files changed, 418 insertions(+), 243 deletions(-)

diff --git a/Include/internal/pycore_crossinterp.h b/Include/internal/pycore_crossinterp.h
index ee9ff0090c2484..ec9dac96292f35 100644
--- a/Include/internal/pycore_crossinterp.h
+++ b/Include/internal/pycore_crossinterp.h
@@ -170,9 +170,14 @@ extern void _PyXI_Fini(PyInterpreterState *interp);
 // of the exception in the calling interpreter.
 
 typedef struct _excinfo {
-    const char *type;
+    struct _excinfo_type {
+        PyTypeObject *builtin;
+        const char *name;
+        const char *qualname;
+        const char *module;
+    } type;
     const char *msg;
-} _Py_excinfo;
+} _PyXI_excinfo;
 
 
 typedef enum error_code {
@@ -193,13 +198,13 @@ typedef struct _sharedexception {
     // The kind of error to propagate.
     _PyXI_errcode code;
     // The exception information to propagate, if applicable.
-    // This is populated only for _PyXI_ERR_UNCAUGHT_EXCEPTION.
-    _Py_excinfo uncaught;
-} _PyXI_exception_info;
+    // This is populated only for some error codes,
+    // but always for _PyXI_ERR_UNCAUGHT_EXCEPTION.
+    _PyXI_excinfo uncaught;
+} _PyXI_error;
+
+PyAPI_FUNC(PyObject *) _PyXI_ApplyError(_PyXI_error *err);
 
-PyAPI_FUNC(void) _PyXI_ApplyExceptionInfo(
-    _PyXI_exception_info *info,
-    PyObject *exctype);
 
 typedef struct xi_session _PyXI_session;
 typedef struct _sharedns _PyXI_namespace;
@@ -251,13 +256,13 @@ struct xi_session {
 
     // This is set if the interpreter is entered and raised an exception
     // that needs to be handled in some special way during exit.
-    _PyXI_errcode *exc_override;
+    _PyXI_errcode *error_override;
     // This is set if exit captured an exception to propagate.
-    _PyXI_exception_info *exc;
+    _PyXI_error *error;
 
     // -- pre-allocated memory --
-    _PyXI_exception_info _exc;
-    _PyXI_errcode _exc_override;
+    _PyXI_error _error;
+    _PyXI_errcode _error_override;
 };
 
 PyAPI_FUNC(int) _PyXI_Enter(
@@ -266,9 +271,7 @@ PyAPI_FUNC(int) _PyXI_Enter(
     PyObject *nsupdates);
 PyAPI_FUNC(void) _PyXI_Exit(_PyXI_session *session);
 
-PyAPI_FUNC(void) _PyXI_ApplyCapturedException(
-    _PyXI_session *session,
-    PyObject *excwrapper);
+PyAPI_FUNC(PyObject *) _PyXI_ApplyCapturedException(_PyXI_session *session);
 PyAPI_FUNC(int) _PyXI_HasCapturedException(_PyXI_session *session);
 
 
diff --git a/Lib/test/support/interpreters.py b/Lib/test/support/interpreters.py
index ab9342b767dfae..089fe7ef56df78 100644
--- a/Lib/test/support/interpreters.py
+++ b/Lib/test/support/interpreters.py
@@ -14,6 +14,7 @@
 
 __all__ = [
     'Interpreter', 'get_current', 'get_main', 'create', 'list_all',
+    'RunFailedError',
     'SendChannel', 'RecvChannel',
     'create_channel', 'list_all_channels', 'is_shareable',
     'ChannelError', 'ChannelNotFoundError',
@@ -21,6 +22,19 @@
     ]
 
 
+class RunFailedError(RuntimeError):
+
+    def __init__(self, excinfo):
+        msg = excinfo.formatted
+        if not msg:
+            if excinfo.type and snapshot.msg:
+                msg = f'{snapshot.type.__name__}: {snapshot.msg}'
+            else:
+                msg = snapshot.type.__name__ or snapshot.msg
+        super().__init__(msg)
+        self.snapshot = excinfo
+
+
 def create(*, isolated=True):
     """Return a new (idle) Python interpreter."""
     id = _interpreters.create(isolated=isolated)
@@ -110,7 +124,9 @@ def run(self, src_str, /, channels=None):
         that time, the previous interpreter is allowed to run
         in other threads.
         """
-        _interpreters.exec(self._id, src_str, channels)
+        excinfo = _interpreters.exec(self._id, src_str, channels)
+        if excinfo is not None:
+            raise RunFailedError(excinfo)
 
 
 def create_channel():
diff --git a/Lib/test/test__xxinterpchannels.py b/Lib/test/test__xxinterpchannels.py
index 1c1ef3fac9d65f..2b75e2f1916c82 100644
--- a/Lib/test/test__xxinterpchannels.py
+++ b/Lib/test/test__xxinterpchannels.py
@@ -1017,16 +1017,16 @@ def test_close_multiple_users(self):
             _channels.recv({cid})
             """))
         channels.close(cid)
-        with self.assertRaises(interpreters.RunFailedError) as cm:
-            interpreters.run_string(id1, dedent(f"""
+
+        excsnap = interpreters.run_string(id1, dedent(f"""
                 _channels.send({cid}, b'spam')
                 """))
-        self.assertIn('ChannelClosedError', str(cm.exception))
-        with self.assertRaises(interpreters.RunFailedError) as cm:
-            interpreters.run_string(id2, dedent(f"""
+        self.assertEqual(excsnap.type.__name__, 'ChannelClosedError')
+
+        excsnap = interpreters.run_string(id2, dedent(f"""
                 _channels.send({cid}, b'spam')
                 """))
-        self.assertIn('ChannelClosedError', str(cm.exception))
+        self.assertEqual(excsnap.type.__name__, 'ChannelClosedError')
 
     def test_close_multiple_times(self):
         cid = channels.create()
diff --git a/Lib/test/test__xxsubinterpreters.py b/Lib/test/test__xxsubinterpreters.py
index d2056c9f52287b..64a9db95e5eaf5 100644
--- a/Lib/test/test__xxsubinterpreters.py
+++ b/Lib/test/test__xxsubinterpreters.py
@@ -940,7 +940,6 @@ def add_module(self, modname, text):
         return script_helper.make_script(tempdir, modname, text)
 
     def run_script(self, text, *, fails=False):
-        excwrapper = interpreters.RunFailedError
         r, w = os.pipe()
         try:
             script = dedent(f"""
@@ -956,11 +955,12 @@ class NeverError(Exception): pass
                 raise NeverError  # never raised
                 """).format(dedent(text))
             if fails:
-                with self.assertRaises(excwrapper) as caught:
-                    interpreters.run_string(self.id, script)
-                return caught.exception
+                err = interpreters.run_string(self.id, script)
+                self.assertIsNot(err, None)
+                return err
             else:
-                interpreters.run_string(self.id, script)
+                err = interpreters.run_string(self.id, script)
+                self.assertIs(err, None)
                 return None
         except:
             raise  # re-raise
@@ -979,17 +979,18 @@ def _assert_run_failed(self, exctype, msg, script):
             exctype_name = exctype.__name__
 
         # Run the script.
-        exc = self.run_script(script, fails=True)
+        excinfo = self.run_script(script, fails=True)
 
         # Check the wrapper exception.
+        self.assertEqual(excinfo.type.__name__, exctype_name)
         if msg is None:
-            self.assertEqual(str(exc).split(':')[0],
+            self.assertEqual(excinfo.formatted.split(':')[0],
                              exctype_name)
         else:
-            self.assertEqual(str(exc),
+            self.assertEqual(excinfo.formatted,
                              '{}: {}'.format(exctype_name, msg))
 
-        return exc
+        return excinfo
 
     def assert_run_failed(self, exctype, script):
         self._assert_run_failed(exctype, None, script)
diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
index aa465c70dfbcd0..1ecac4f37fe1c1 100644
--- a/Lib/test/test_import/__init__.py
+++ b/Lib/test/test_import/__init__.py
@@ -1968,10 +1968,12 @@ def test_disallowed_reimport(self):
             print(_testsinglephase)
             ''')
         interpid = _interpreters.create()
-        with self.assertRaises(_interpreters.RunFailedError):
-            _interpreters.run_string(interpid, script)
-        with self.assertRaises(_interpreters.RunFailedError):
-            _interpreters.run_string(interpid, script)
+
+        excsnap = _interpreters.run_string(interpid, script)
+        self.assertIsNot(excsnap, None)
+
+        excsnap = _interpreters.run_string(interpid, script)
+        self.assertIsNot(excsnap, None)
 
 
 class TestSinglePhaseSnapshot(ModuleSnapshot):
diff --git a/Lib/test/test_importlib/test_util.py b/Lib/test/test_importlib/test_util.py
index 5da72a21f586ee..914176559806f4 100644
--- a/Lib/test/test_importlib/test_util.py
+++ b/Lib/test/test_importlib/test_util.py
@@ -655,25 +655,19 @@ def test_magic_number(self):
 @unittest.skipIf(_interpreters is None, 'subinterpreters required')
 class IncompatibleExtensionModuleRestrictionsTests(unittest.TestCase):
 
-    ERROR = re.compile("^ImportError: module (.*) does not support loading in subinterpreters")
-
     def run_with_own_gil(self, script):
         interpid = _interpreters.create(isolated=True)
-        try:
-            _interpreters.run_string(interpid, script)
-        except _interpreters.RunFailedError as exc:
-            if m := self.ERROR.match(str(exc)):
-                modname, = m.groups()
-                raise ImportError(modname)
+        excsnap = _interpreters.run_string(interpid, script)
+        if excsnap is not None:
+            if excsnap.type.__name__ == 'ImportError':
+                raise ImportError(excsnap.msg)
 
     def run_with_shared_gil(self, script):
         interpid = _interpreters.create(isolated=False)
-        try:
-            _interpreters.run_string(interpid, script)
-        except _interpreters.RunFailedError as exc:
-            if m := self.ERROR.match(str(exc)):
-                modname, = m.groups()
-                raise ImportError(modname)
+        excsnap = _interpreters.run_string(interpid, script)
+        if excsnap is not None:
+            if excsnap.type.__name__ == 'ImportError':
+                raise ImportError(excsnap.msg)
 
     @unittest.skipIf(_testsinglephase is None, "test requires _testsinglephase module")
     def test_single_phase_init_module(self):
diff --git a/Lib/test/test_interpreters.py b/Lib/test/test_interpreters.py
index 7c030bcf0321cd..5663706c0ccfb7 100644
--- a/Lib/test/test_interpreters.py
+++ b/Lib/test/test_interpreters.py
@@ -478,6 +478,11 @@ def test_success(self):
 
         self.assertEqual(out, 'it worked!')
 
+    def test_failure(self):
+        interp = interpreters.create()
+        with self.assertRaises(interpreters.RunFailedError):
+            interp.run('raise Exception')
+
     def test_in_thread(self):
         interp = interpreters.create()
         script, file = _captured_script('print("it worked!", end="")')
diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c
index 001fa887847cbd..02c2abed27ddfa 100644
--- a/Modules/_xxsubinterpretersmodule.c
+++ b/Modules/_xxsubinterpretersmodule.c
@@ -28,31 +28,11 @@ _get_current_interp(void)
     return PyInterpreterState_Get();
 }
 
-static PyObject *
-add_new_exception(PyObject *mod, const char *name, PyObject *base)
-{
-    assert(!PyObject_HasAttrStringWithError(mod, name));
-    PyObject *exctype = PyErr_NewException(name, base, NULL);
-    if (exctype == NULL) {
-        return NULL;
-    }
-    int res = PyModule_AddType(mod, (PyTypeObject *)exctype);
-    if (res < 0) {
-        Py_DECREF(exctype);
-        return NULL;
-    }
-    return exctype;
-}
-
-#define ADD_NEW_EXCEPTION(MOD, NAME, BASE) \
-    add_new_exception(MOD, MODULE_NAME "." Py_STRINGIFY(NAME), BASE)
-
 
 /* module state *************************************************************/
 
 typedef struct {
-    /* exceptions */
-    PyObject *RunFailedError;
+    int _notused;
 } module_state;
 
 static inline module_state *
@@ -67,18 +47,12 @@ get_module_state(PyObject *mod)
 static int
 traverse_module_state(module_state *state, visitproc visit, void *arg)
 {
-    /* exceptions */
-    Py_VISIT(state->RunFailedError);
-
     return 0;
 }
 
 static int
 clear_module_state(module_state *state)
 {
-    /* exceptions */
-    Py_CLEAR(state->RunFailedError);
-
     return 0;
 }
 
@@ -177,30 +151,6 @@ get_code_str(PyObject *arg, Py_ssize_t *len_p, PyObject **bytes_p, int *flags_p)
 
 /* interpreter-specific code ************************************************/
 
-static int
-exceptions_init(PyObject *mod)
-{
-    module_state *state = get_module_state(mod);
-    if (state == NULL) {
-        return -1;
-    }
-
-#define ADD(NAME, BASE) \
-    do { \
-        assert(state->NAME == NULL); \
-        state->NAME = ADD_NEW_EXCEPTION(mod, NAME, BASE); \
-        if (state->NAME == NULL) { \
-            return -1; \
-        } \
-    } while (0)
-
-    // An uncaught exception came out of interp_run_string().
-    ADD(RunFailedError, PyExc_RuntimeError);
-#undef ADD
-
-    return 0;
-}
-
 static int
 _run_script(PyObject *ns, const char *codestr, Py_ssize_t codestrlen, int flags)
 {
@@ -229,7 +179,7 @@ static int
 _run_in_interpreter(PyInterpreterState *interp,
                     const char *codestr, Py_ssize_t codestrlen,
                     PyObject *shareables, int flags,
-                    PyObject *excwrapper)
+                    PyObject **p_excinfo)
 {
     assert(!PyErr_Occurred());
     _PyXI_session session = {0};
@@ -237,7 +187,10 @@ _run_in_interpreter(PyInterpreterState *interp,
     // Prep and switch interpreters.
     if (_PyXI_Enter(&session, interp, shareables) < 0) {
         assert(!PyErr_Occurred());
-        _PyXI_ApplyExceptionInfo(session.exc, excwrapper);
+        PyObject *excinfo = _PyXI_ApplyError(session.error);
+        if (excinfo != NULL) {
+            *p_excinfo = excinfo;
+        }
         assert(PyErr_Occurred());
         return -1;
     }
@@ -251,7 +204,10 @@ _run_in_interpreter(PyInterpreterState *interp,
     // Propagate any exception out to the caller.
     assert(!PyErr_Occurred());
     if (res < 0) {
-        _PyXI_ApplyCapturedException(&session, excwrapper);
+        PyObject *excinfo = _PyXI_ApplyCapturedException(&session);
+        if (excinfo != NULL) {
+            *p_excinfo = excinfo;
+        }
     }
     else {
         assert(!_PyXI_HasCapturedException(&session));
@@ -521,7 +477,8 @@ convert_code_arg(PyObject *arg, const char *fname, const char *displayname,
 
 static int
 _interp_exec(PyObject *self,
-             PyObject *id_arg, PyObject *code_arg, PyObject *shared_arg)
+             PyObject *id_arg, PyObject *code_arg, PyObject *shared_arg,
+             PyObject **p_excinfo)
 {
     // Look up the interpreter.
     PyInterpreterState *interp = PyInterpreterID_LookUp(id_arg);
@@ -540,10 +497,8 @@ _interp_exec(PyObject *self,
     }
 
     // Run the code in the interpreter.
-    module_state *state = get_module_state(self);
-    assert(state != NULL);
     int res = _run_in_interpreter(interp, codestr, codestrlen,
-                                  shared_arg, flags, state->RunFailedError);
+                                  shared_arg, flags, p_excinfo);
     Py_XDECREF(bytes_obj);
     if (res < 0) {
         return -1;
@@ -577,10 +532,12 @@ interp_exec(PyObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    int res = _interp_exec(self, id, code, shared);
+    PyObject *excinfo = NULL;
+    int res = _interp_exec(self, id, code, shared, &excinfo);
     Py_DECREF(code);
     if (res < 0) {
-        return NULL;
+        assert((excinfo == NULL) != (PyErr_Occurred() == NULL));
+        return excinfo;
     }
     Py_RETURN_NONE;
 }
@@ -620,10 +577,12 @@ interp_run_string(PyObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    int res = _interp_exec(self, id, script, shared);
+    PyObject *excinfo = NULL;
+    int res = _interp_exec(self, id, script, shared, &excinfo);
     Py_DECREF(script);
     if (res < 0) {
-        return NULL;
+        assert((excinfo == NULL) != (PyErr_Occurred() == NULL));
+        return excinfo;
     }
     Py_RETURN_NONE;
 }
@@ -654,10 +613,12 @@ interp_run_func(PyObject *self, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
-    int res = _interp_exec(self, id, (PyObject *)code, shared);
+    PyObject *excinfo = NULL;
+    int res = _interp_exec(self, id, (PyObject *)code, shared, &excinfo);
     Py_DECREF(code);
     if (res < 0) {
-        return NULL;
+        assert((excinfo == NULL) != (PyErr_Occurred() == NULL));
+        return excinfo;
     }
     Py_RETURN_NONE;
 }
@@ -759,11 +720,6 @@ The 'interpreters' module provides a more convenient interface.");
 static int
 module_exec(PyObject *mod)
 {
-    /* Add exception types */
-    if (exceptions_init(mod) != 0) {
-        goto error;
-    }
-
     // PyInterpreterID
     if (PyModule_AddType(mod, &PyInterpreterID_Type) < 0) {
         goto error;
diff --git a/Python/crossinterp.c b/Python/crossinterp.c
index a908f9ae340ee9..21b96ef05ed799 100644
--- a/Python/crossinterp.c
+++ b/Python/crossinterp.c
@@ -5,8 +5,10 @@
 #include "pycore_ceval.h"         // _Py_simple_func
 #include "pycore_crossinterp.h"   // struct _xid
 #include "pycore_initconfig.h"    // _PyStatus_OK()
+#include "pycore_namespace.h"     //_PyNamespace_New()
 #include "pycore_pyerrors.h"      // _PyErr_Clear()
 #include "pycore_pystate.h"       // _PyInterpreterState_GET()
+#include "pycore_typeobject.h"    // _PyType_GetModuleName()
 #include "pycore_weakref.h"       // _PyWeakref_GET_REF()
 
 
@@ -564,6 +566,8 @@ _lookup_getdata_from_registry(PyInterpreterState *interp, PyObject *obj)
 
 /* cross-interpreter data for builtin types */
 
+// bytes
+
 struct _shared_bytes_data {
     char *bytes;
     Py_ssize_t len;
@@ -595,6 +599,8 @@ _bytes_shared(PyThreadState *tstate, PyObject *obj,
     return 0;
 }
 
+// str
+
 struct _shared_str_data {
     int kind;
     const void *buffer;
@@ -626,6 +632,8 @@ _str_shared(PyThreadState *tstate, PyObject *obj,
     return 0;
 }
 
+// int
+
 static PyObject *
 _new_long_object(_PyCrossInterpreterData *data)
 {
@@ -653,6 +661,8 @@ _long_shared(PyThreadState *tstate, PyObject *obj,
     return 0;
 }
 
+// float
+
 static PyObject *
 _new_float_object(_PyCrossInterpreterData *data)
 {
@@ -676,6 +686,8 @@ _float_shared(PyThreadState *tstate, PyObject *obj,
     return 0;
 }
 
+// None
+
 static PyObject *
 _new_none_object(_PyCrossInterpreterData *data)
 {
@@ -693,6 +705,8 @@ _none_shared(PyThreadState *tstate, PyObject *obj,
     return 0;
 }
 
+// bool
+
 static PyObject *
 _new_bool_object(_PyCrossInterpreterData *data)
 {
@@ -713,6 +727,8 @@ _bool_shared(PyThreadState *tstate, PyObject *obj,
     return 0;
 }
 
+// tuple
+
 struct _shared_tuple_data {
     Py_ssize_t len;
     _PyCrossInterpreterData **data;
@@ -806,6 +822,8 @@ _tuple_shared(PyThreadState *tstate, PyObject *obj,
     return -1;
 }
 
+// registration
+
 static void
 _register_builtins_for_crossinterpreter_data(struct _xidregistry *xidregistry)
 {
@@ -898,17 +916,6 @@ _xidregistry_fini(struct _xidregistry *registry)
 /* convenience utilities */
 /*************************/
 
-static const char *
-_copy_raw_string(const char *str)
-{
-    char *copied = PyMem_RawMalloc(strlen(str)+1);
-    if (copied == NULL) {
-        return NULL;
-    }
-    strcpy(copied, str);
-    return copied;
-}
-
 static const char *
 _copy_string_obj_raw(PyObject *strobj)
 {
@@ -944,115 +951,309 @@ _release_xid_data(_PyCrossInterpreterData *data, int rawfree)
 }
 
 
+/***********************/
 /* exception snapshots */
+/***********************/
 
 static int
-_exc_type_name_as_utf8(PyObject *exc, const char **p_typename)
+_excinfo_init_type(struct _excinfo_type *info, PyObject *exc)
 {
-    // XXX Use PyObject_GetAttrString(Py_TYPE(exc), '__name__')?
-    PyObject *nameobj = PyUnicode_FromString(Py_TYPE(exc)->tp_name);
-    if (nameobj == NULL) {
-        assert(PyErr_Occurred());
-        *p_typename = "unable to format exception type name";
-        return -1;
+    /* Note that this copies directly rather than into an intermediate
+       struct and does not clear on error.  If we need that then we
+       should have a separate function to wrap this one
+       and do all that there. */
+    PyObject *strobj = NULL;
+
+    PyTypeObject *type = Py_TYPE(exc);
+    if (type->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN) {
+        assert(_Py_IsImmortal((PyObject *)type));
+        info->builtin = type;
     }
-    const char *name = PyUnicode_AsUTF8(nameobj);
-    if (name == NULL) {
-        assert(PyErr_Occurred());
-        Py_DECREF(nameobj);
-        *p_typename = "unable to encode exception type name";
+    else {
+        // Only builtin types are preserved.
+        info->builtin = NULL;
+    }
+
+    // __name__
+    strobj = PyType_GetName(type);
+    if (strobj == NULL) {
         return -1;
     }
-    name = _copy_raw_string(name);
-    Py_DECREF(nameobj);
-    if (name == NULL) {
-        *p_typename = "out of memory copying exception type name";
+    info->name = _copy_string_obj_raw(strobj);
+    Py_DECREF(strobj);
+    if (info->name == NULL) {
         return -1;
     }
-    *p_typename = name;
-    return 0;
-}
 
-static int
-_exc_msg_as_utf8(PyObject *exc, const char **p_msg)
-{
-    PyObject *msgobj = PyObject_Str(exc);
-    if (msgobj == NULL) {
-        assert(PyErr_Occurred());
-        *p_msg = "unable to format exception message";
+    // __qualname__
+    strobj = PyType_GetQualName(type);
+    if (strobj == NULL) {
         return -1;
     }
-    const char *msg = PyUnicode_AsUTF8(msgobj);
-    if (msg == NULL) {
-        assert(PyErr_Occurred());
-        Py_DECREF(msgobj);
-        *p_msg = "unable to encode exception message";
+    info->qualname = _copy_string_obj_raw(strobj);
+    Py_DECREF(strobj);
+    if (info->name == NULL) {
         return -1;
     }
-    msg = _copy_raw_string(msg);
-    Py_DECREF(msgobj);
-    if (msg == NULL) {
-        assert(PyErr_ExceptionMatches(PyExc_MemoryError));
-        *p_msg = "out of memory copying exception message";
+
+    // __module__
+    strobj = _PyType_GetModuleName(type);
+    if (strobj == NULL) {
+        return -1;
+    }
+    info->module = _copy_string_obj_raw(strobj);
+    Py_DECREF(strobj);
+    if (info->name == NULL) {
         return -1;
     }
-    *p_msg = msg;
+
     return 0;
 }
 
 static void
-_Py_excinfo_Clear(_Py_excinfo *info)
+_excinfo_clear_type(struct _excinfo_type *info)
 {
-    if (info->type != NULL) {
-        PyMem_RawFree((void *)info->type);
+    if (info->builtin != NULL) {
+        assert(info->builtin->tp_flags & _Py_TPFLAGS_STATIC_BUILTIN);
+        assert(_Py_IsImmortal((PyObject *)info->builtin));
+    }
+    if (info->name != NULL) {
+        PyMem_RawFree((void *)info->name);
+    }
+    if (info->qualname != NULL) {
+        PyMem_RawFree((void *)info->qualname);
+    }
+    if (info->module != NULL) {
+        PyMem_RawFree((void *)info->module);
+    }
+    *info = (struct _excinfo_type){NULL};
+}
+
+static void
+_excinfo_normalize_type(struct _excinfo_type *info,
+                        const char **p_module, const char **p_qualname)
+{
+    if (info->name == NULL) {
+        assert(info->builtin == NULL);
+        assert(info->qualname == NULL);
+        assert(info->module == NULL);
+        // This is inspired by TracebackException.format_exception_only().
+        *p_module = NULL;
+        *p_qualname = NULL;
+        return;
+    }
+
+    const char *module = info->module;
+    const char *qualname = info->qualname;
+    if (qualname == NULL) {
+        qualname = info->name;
     }
+    assert(module != NULL);
+    if (strcmp(module, "builtins") == 0) {
+        module = NULL;
+    }
+    else if (strcmp(module, "__main__") == 0) {
+        module = NULL;
+    }
+    *p_qualname = qualname;
+    *p_module = module;
+}
+
+static void
+_PyXI_excinfo_Clear(_PyXI_excinfo *info)
+{
+    _excinfo_clear_type(&info->type);
     if (info->msg != NULL) {
         PyMem_RawFree((void *)info->msg);
     }
-    *info = (_Py_excinfo){ NULL };
+    *info = (_PyXI_excinfo){{NULL}};
+}
+
+static PyObject *
+_PyXI_excinfo_format(_PyXI_excinfo *info)
+{
+    const char *module, *qualname;
+    _excinfo_normalize_type(&info->type, &module, &qualname);
+    if (qualname != NULL) {
+        if (module != NULL) {
+            if (info->msg != NULL) {
+                return PyUnicode_FromFormat("%s.%s: %s",
+                                            module, qualname, info->msg);
+            }
+            else {
+                return PyUnicode_FromFormat("%s.%s", module, qualname);
+            }
+        }
+        else {
+            if (info->msg != NULL) {
+                return PyUnicode_FromFormat("%s: %s", qualname, info->msg);
+            }
+            else {
+                return PyUnicode_FromString(qualname);
+            }
+        }
+    }
+    else if (info->msg != NULL) {
+        return PyUnicode_FromString(info->msg);
+    }
+    else {
+        Py_RETURN_NONE;
+    }
 }
 
 static const char *
-_Py_excinfo_InitFromException(_Py_excinfo *info, PyObject *exc)
+_PyXI_excinfo_InitFromException(_PyXI_excinfo *info, PyObject *exc)
 {
     assert(exc != NULL);
 
-    // Extract the exception type name.
-    const char *typename = NULL;
-    if (_exc_type_name_as_utf8(exc, &typename) < 0) {
-        assert(typename != NULL);
-        return typename;
+    if (PyErr_GivenExceptionMatches(exc, PyExc_MemoryError)) {
+        _PyXI_excinfo_Clear(info);
+        return NULL;
+    }
+    const char *failure = NULL;
+
+    if (_excinfo_init_type(&info->type, exc) < 0) {
+        failure = "error while initializing exception type snapshot";
+        goto error;
     }
 
     // Extract the exception message.
-    const char *msg = NULL;
-    if (_exc_msg_as_utf8(exc, &msg) < 0) {
-        assert(msg != NULL);
-        return msg;
+    PyObject *msgobj = PyObject_Str(exc);
+    if (msgobj == NULL) {
+        failure = "error while formatting exception";
+        goto error;
+    }
+    info->msg = _copy_string_obj_raw(msgobj);
+    Py_DECREF(msgobj);
+    if (info->msg == NULL) {
+        failure = "error while copying exception message";
+        goto error;
     }
 
-    info->type = typename;
-    info->msg = msg;
     return NULL;
+
+error:
+    assert(failure != NULL);
+    _PyXI_excinfo_Clear(info);
+    return failure;
 }
 
 static void
-_Py_excinfo_Apply(_Py_excinfo *info, PyObject *exctype)
+_PyXI_excinfo_Apply(_PyXI_excinfo *info, PyObject *exctype)
+{
+    PyObject *formatted = _PyXI_excinfo_format(info);
+    PyErr_SetObject(exctype, formatted);
+    Py_DECREF(formatted);
+}
+
+static PyObject *
+_PyXI_excinfo_TypeAsObject(_PyXI_excinfo *info)
 {
-    if (info->type != NULL) {
-        if (info->msg != NULL) {
-            PyErr_Format(exctype, "%s: %s",  info->type, info->msg);
+    PyObject *ns = _PyNamespace_New(NULL);
+    if (ns == NULL) {
+        return NULL;
+    }
+    int empty = 1;
+
+    if (info->type.name != NULL) {
+        PyObject *name = PyUnicode_FromString(info->type.name);
+        if (name == NULL) {
+            goto error;
         }
-        else {
-            PyErr_SetString(exctype, info->type);
+        int res = PyObject_SetAttrString(ns, "__name__", name);
+        Py_DECREF(name);
+        if (res < 0) {
+            goto error;
         }
+        empty = 0;
     }
-    else if (info->msg != NULL) {
-        PyErr_SetString(exctype, info->msg);
+
+    if (info->type.qualname != NULL) {
+        PyObject *qualname = PyUnicode_FromString(info->type.qualname);
+        if (qualname == NULL) {
+            goto error;
+        }
+        int res = PyObject_SetAttrString(ns, "__qualname__", qualname);
+        Py_DECREF(qualname);
+        if (res < 0) {
+            goto error;
+        }
+        empty = 0;
     }
-    else {
-        PyErr_SetNone(exctype);
+
+    if (info->type.module != NULL) {
+        PyObject *module = PyUnicode_FromString(info->type.module);
+        if (module == NULL) {
+            goto error;
+        }
+        int res = PyObject_SetAttrString(ns, "__module__", module);
+        Py_DECREF(module);
+        if (res < 0) {
+            goto error;
+        }
+        empty = 0;
+    }
+
+    if (empty) {
+        Py_CLEAR(ns);
+    }
+
+    return ns;
+
+error:
+    Py_DECREF(ns);
+    return NULL;
+}
+
+static PyObject *
+_PyXI_excinfo_AsObject(_PyXI_excinfo *info)
+{
+    PyObject *ns = _PyNamespace_New(NULL);
+    if (ns == NULL) {
+        return NULL;
+    }
+    int res;
+
+    PyObject *type = _PyXI_excinfo_TypeAsObject(info);
+    if (type == NULL) {
+        if (PyErr_Occurred()) {
+            goto error;
+        }
+        type = Py_NewRef(Py_None);
+    }
+    res = PyObject_SetAttrString(ns, "type", type);
+    Py_DECREF(type);
+    if (res < 0) {
+        goto error;
+    }
+
+    PyObject *msg = info->msg != NULL
+        ? PyUnicode_FromString(info->msg)
+        : Py_NewRef(Py_None);
+    if (msg == NULL) {
+        goto error;
+    }
+    res = PyObject_SetAttrString(ns, "msg", msg);
+    Py_DECREF(msg);
+    if (res < 0) {
+        goto error;
     }
+
+    PyObject *formatted = _PyXI_excinfo_format(info);
+    if (formatted == NULL) {
+        goto error;
+    }
+    res = PyObject_SetAttrString(ns, "formatted", formatted);
+    Py_DECREF(formatted);
+    if (res < 0) {
+        goto error;
+    }
+
+    return ns;
+
+error:
+    Py_DECREF(ns);
+    return NULL;
 }
 
 
@@ -1111,72 +1312,69 @@ _PyXI_ApplyErrorCode(_PyXI_errcode code, PyInterpreterState *interp)
 /* shared exceptions */
 
 static const char *
-_PyXI_InitExceptionInfo(_PyXI_exception_info *info,
-                        PyObject *excobj, _PyXI_errcode code)
+_PyXI_InitError(_PyXI_error *error, PyObject *excobj, _PyXI_errcode code)
 {
-    if (info->interp == NULL) {
-        info->interp = PyInterpreterState_Get();
+    if (error->interp == NULL) {
+        error->interp = PyInterpreterState_Get();
     }
 
     const char *failure = NULL;
     if (code == _PyXI_ERR_UNCAUGHT_EXCEPTION) {
         // There is an unhandled exception we need to propagate.
-        failure = _Py_excinfo_InitFromException(&info->uncaught, excobj);
+        failure = _PyXI_excinfo_InitFromException(&error->uncaught, excobj);
         if (failure != NULL) {
-            // We failed to initialize info->uncaught.
+            // We failed to initialize error->uncaught.
             // XXX Print the excobj/traceback?  Emit a warning?
             // XXX Print the current exception/traceback?
             if (PyErr_ExceptionMatches(PyExc_MemoryError)) {
-                info->code = _PyXI_ERR_NO_MEMORY;
+                error->code = _PyXI_ERR_NO_MEMORY;
             }
             else {
-                info->code = _PyXI_ERR_OTHER;
+                error->code = _PyXI_ERR_OTHER;
             }
             PyErr_Clear();
         }
         else {
-            info->code = code;
+            error->code = code;
         }
-        assert(info->code != _PyXI_ERR_NO_ERROR);
+        assert(error->code != _PyXI_ERR_NO_ERROR);
     }
     else {
         // There is an error code we need to propagate.
         assert(excobj == NULL);
         assert(code != _PyXI_ERR_NO_ERROR);
-        info->code = code;
-        _Py_excinfo_Clear(&info->uncaught);
+        error->code = code;
+        _PyXI_excinfo_Clear(&error->uncaught);
     }
     return failure;
 }
 
-void
-_PyXI_ApplyExceptionInfo(_PyXI_exception_info *info, PyObject *exctype)
+PyObject *
+_PyXI_ApplyError(_PyXI_error *error)
 {
-    if (exctype == NULL) {
-        exctype = PyExc_RuntimeError;
-    }
-    if (info->code == _PyXI_ERR_UNCAUGHT_EXCEPTION) {
+    if (error->code == _PyXI_ERR_UNCAUGHT_EXCEPTION) {
         // Raise an exception that proxies the propagated exception.
-        _Py_excinfo_Apply(&info->uncaught, exctype);
+       return _PyXI_excinfo_AsObject(&error->uncaught);
     }
-    else if (info->code == _PyXI_ERR_NOT_SHAREABLE) {
+    else if (error->code == _PyXI_ERR_NOT_SHAREABLE) {
         // Propagate the exception directly.
-        _set_xid_lookup_failure(info->interp, NULL, info->uncaught.msg);
+        _set_xid_lookup_failure(error->interp, NULL, error->uncaught.msg);
     }
     else {
         // Raise an exception corresponding to the code.
-        assert(info->code != _PyXI_ERR_NO_ERROR);
-        (void)_PyXI_ApplyErrorCode(info->code, info->interp);
-        if (info->uncaught.type != NULL || info->uncaught.msg != NULL) {
+        assert(error->code != _PyXI_ERR_NO_ERROR);
+        (void)_PyXI_ApplyErrorCode(error->code, error->interp);
+        if (error->uncaught.type.name != NULL || error->uncaught.msg != NULL) {
             // __context__ will be set to a proxy of the propagated exception.
             PyObject *exc = PyErr_GetRaisedException();
-            _Py_excinfo_Apply(&info->uncaught, exctype);
+            _PyXI_excinfo_Apply(&error->uncaught, PyExc_RuntimeError);
             PyObject *exc2 = PyErr_GetRaisedException();
             PyException_SetContext(exc, exc2);
             PyErr_SetRaisedException(exc);
         }
     }
     assert(PyErr_Occurred());
+    return NULL;
 }
 
 /* shared namespaces */
@@ -1603,7 +1801,7 @@ _PyXI_NamespaceFromDict(PyObject *nsobj, _PyXI_session *session)
 
 error:
     assert(PyErr_Occurred()
-           || (session != NULL && session->exc_override != NULL));
+           || (session != NULL && session->error_override != NULL));
     _sharedns_free(ns);
     return NULL;
 }
@@ -1637,9 +1835,9 @@ _enter_session(_PyXI_session *session, PyInterpreterState *interp)
     assert(!session->running);
     assert(session->main_ns == NULL);
     // Set elsewhere and cleared in _capture_current_exception().
-    assert(session->exc_override == NULL);
+    assert(session->error_override == NULL);
     // Set elsewhere and cleared in _PyXI_ApplyCapturedException().
-    assert(session->exc == NULL);
+    assert(session->error == NULL);
 
     // Switch to interpreter.
     PyThreadState *tstate = PyThreadState_Get();
@@ -1708,23 +1906,23 @@ _propagate_not_shareable_error(_PyXI_session *session)
     PyInterpreterState *interp = _PyInterpreterState_GET();
     if (PyErr_ExceptionMatches(_get_not_shareable_error_type(interp))) {
         // We want to propagate the exception directly.
-        session->_exc_override = _PyXI_ERR_NOT_SHAREABLE;
-        session->exc_override = &session->_exc_override;
+        session->_error_override = _PyXI_ERR_NOT_SHAREABLE;
+        session->error_override = &session->_error_override;
     }
 }
 
 static void
 _capture_current_exception(_PyXI_session *session)
 {
-    assert(session->exc == NULL);
+    assert(session->error == NULL);
     if (!PyErr_Occurred()) {
-        assert(session->exc_override == NULL);
+        assert(session->error_override == NULL);
         return;
     }
 
     // Handle the exception override.
-    _PyXI_errcode *override = session->exc_override;
-    session->exc_override = NULL;
+    _PyXI_errcode *override = session->error_override;
+    session->error_override = NULL;
     _PyXI_errcode errcode = override != NULL
         ? *override
         : _PyXI_ERR_UNCAUGHT_EXCEPTION;
@@ -1747,19 +1945,18 @@ _capture_current_exception(_PyXI_session *session)
     }
 
     // Capture the exception.
-    _PyXI_exception_info *exc = &session->_exc;
-    *exc = (_PyXI_exception_info){
+    _PyXI_error *err = &session->_error;
+    *err = (_PyXI_error){
         .interp = session->init_tstate->interp,
     };
     const char *failure;
     if (excval == NULL) {
-        failure = _PyXI_InitExceptionInfo(exc, NULL, errcode);
+        failure = _PyXI_InitError(err, NULL, errcode);
     }
     else {
-        failure = _PyXI_InitExceptionInfo(exc, excval,
-                                          _PyXI_ERR_UNCAUGHT_EXCEPTION);
+        failure = _PyXI_InitError(err, excval, _PyXI_ERR_UNCAUGHT_EXCEPTION);
         if (failure == NULL && override != NULL) {
-            exc->code = errcode;
+            err->code = errcode;
         }
     }
 
@@ -1769,7 +1966,7 @@ _capture_current_exception(_PyXI_session *session)
         fprintf(stderr,
                 "RunFailedError: script raised an uncaught exception (%s)",
                 failure);
-        exc = NULL;
+        err = NULL;
     }
 
     // a temporary hack  (famous last words)
@@ -1786,23 +1983,24 @@ _capture_current_exception(_PyXI_session *session)
 
     // Finished!
     assert(!PyErr_Occurred());
-    session->exc = exc;
+    session->error  = err;
 }
 
-void
-_PyXI_ApplyCapturedException(_PyXI_session *session, PyObject *excwrapper)
+PyObject *
+_PyXI_ApplyCapturedException(_PyXI_session *session)
 {
     assert(!PyErr_Occurred());
-    assert(session->exc != NULL);
-    _PyXI_ApplyExceptionInfo(session->exc, excwrapper);
-    assert(PyErr_Occurred());
-    session->exc = NULL;
+    assert(session->error != NULL);
+    PyObject *res = _PyXI_ApplyError(session->error);
+    assert((res == NULL) != (PyErr_Occurred() == NULL));
+    session->error = NULL;
+    return res;
 }
 
 int
 _PyXI_HasCapturedException(_PyXI_session *session)
 {
-    return session->exc != NULL;
+    return session->error != NULL;
 }
 
 int
@@ -1814,7 +2012,7 @@ _PyXI_Enter(_PyXI_session *session,
     if (nsupdates != NULL) {
         sharedns = _PyXI_NamespaceFromDict(nsupdates, NULL);
         if (sharedns == NULL && PyErr_Occurred()) {
-            assert(session->exc == NULL);
+            assert(session->error == NULL);
             return -1;
         }
     }
@@ -1864,7 +2062,7 @@ _PyXI_Enter(_PyXI_session *session,
     assert(PyErr_Occurred());
     // We want to propagate all exceptions here directly (best effort).
     assert(errcode != _PyXI_ERR_UNCAUGHT_EXCEPTION);
-    session->exc_override = &errcode;
+    session->error_override = &errcode;
     _capture_current_exception(session);
     _exit_session(session);
     if (sharedns != NULL) {

From 89ddea4886942b0c27a778a0ad3f0d5ac5f518f0 Mon Sep 17 00:00:00 2001
From: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Date: Thu, 23 Nov 2023 14:34:27 +0000
Subject: [PATCH 08/18] gh-112137: change dis output to show no-lineno as --
 instead of None (#112335)

---
 Lib/dis.py                                    |  3 +-
 Lib/test/test_dis.py                          | 30 +++++++++----------
 ...-11-23-12-37-22.gh-issue-112137.kM46Q6.rst |  1 +
 3 files changed, 18 insertions(+), 16 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2023-11-23-12-37-22.gh-issue-112137.kM46Q6.rst

diff --git a/Lib/dis.py b/Lib/dis.py
index c05b8e0dd8617a..c8313ac15a05c1 100644
--- a/Lib/dis.py
+++ b/Lib/dis.py
@@ -478,7 +478,8 @@ def _disassemble(self, lineno_width=3, mark_as_current=False, offset_width=0):
             if self.starts_line:
                 lineno_fmt = "%%%dd" if self.line_number is not None else "%%%ds"
                 lineno_fmt = lineno_fmt % lineno_width
-                fields.append(lineno_fmt % self.line_number)
+                lineno = self.line_number if self.line_number is not None else '--'
+                fields.append(lineno_fmt % lineno)
             else:
                 fields.append(' ' * lineno_width)
         # Column: Label
diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
index 0e7c59c5797f6c..805cd4e4c30965 100644
--- a/Lib/test/test_dis.py
+++ b/Lib/test/test_dis.py
@@ -412,7 +412,7 @@ def wrap_func_w_kwargs():
 %4d   L2:     LOAD_FAST_CHECK          1 (tb)
                RETURN_VALUE
 
-None   L3:     PUSH_EXC_INFO
+  --   L3:     PUSH_EXC_INFO
 
 %4d           LOAD_GLOBAL              0 (Exception)
                CHECK_EXC_MATCH
@@ -430,14 +430,14 @@ def wrap_func_w_kwargs():
 %4d           LOAD_FAST                1 (tb)
                RETURN_VALUE
 
-None   L6:     LOAD_CONST               0 (None)
+  --   L6:     LOAD_CONST               0 (None)
                STORE_FAST               0 (e)
                DELETE_FAST              0 (e)
                RERAISE                  1
 
 %4d   L7:     RERAISE                  0
 
-None   L8:     COPY                     3
+  --   L8:     COPY                     3
                POP_EXCEPT
                RERAISE                  1
 ExceptionTable:
@@ -518,7 +518,7 @@ def _with(c):
                STORE_FAST               2 (y)
                RETURN_CONST             0 (None)
 
-None   L6:     COPY                     3
+  --   L6:     COPY                     3
                POP_EXCEPT
                RERAISE                  1
 ExceptionTable:
@@ -576,11 +576,11 @@ async def _asyncwith(c):
 
 %4d   L12:     CLEANUP_THROW
 
-None   L13:     JUMP_BACKWARD           26 (to L5)
+  --   L13:     JUMP_BACKWARD           26 (to L5)
 
 %4d   L14:     CLEANUP_THROW
 
-None   L15:     JUMP_BACKWARD           11 (to L11)
+  --   L15:     JUMP_BACKWARD           11 (to L11)
 
 %4d   L16:     PUSH_EXC_INFO
                 WITH_EXCEPT_START
@@ -604,7 +604,7 @@ async def _asyncwith(c):
                 STORE_FAST               2 (y)
                 RETURN_CONST             0 (None)
 
-None   L24:     COPY                     3
+  --   L24:     COPY                     3
                 POP_EXCEPT
                 RERAISE                  1
        L25:     CALL_INTRINSIC_1         3 (INTRINSIC_STOPITERATION_ERROR)
@@ -659,7 +659,7 @@ def _tryfinallyconst(b):
                POP_TOP
                RETURN_VALUE
 
-None   L3:     PUSH_EXC_INFO
+  --   L3:     PUSH_EXC_INFO
 
 %4d           LOAD_FAST                1 (b)
                PUSH_NULL
@@ -667,7 +667,7 @@ def _tryfinallyconst(b):
                POP_TOP
                RERAISE                  0
 
-None   L4:     COPY                     3
+  --   L4:     COPY                     3
                POP_EXCEPT
                RERAISE                  1
 ExceptionTable:
@@ -693,7 +693,7 @@ def _tryfinallyconst(b):
                POP_TOP
                RETURN_CONST             1 (1)
 
-None   L1:     PUSH_EXC_INFO
+  --   L1:     PUSH_EXC_INFO
 
 %4d           LOAD_FAST                0 (b)
                PUSH_NULL
@@ -701,7 +701,7 @@ def _tryfinallyconst(b):
                POP_TOP
                RERAISE                  0
 
-None   L2:     COPY                     3
+  --   L2:     COPY                     3
                POP_EXCEPT
                RERAISE                  1
 ExceptionTable:
@@ -730,7 +730,7 @@ def foo(x):
     return foo
 
 dis_nested_0 = """\
-None           MAKE_CELL                0 (y)
+  --           MAKE_CELL                0 (y)
 
 %4d           RESUME                   0
 
@@ -752,7 +752,7 @@ def foo(x):
 
 dis_nested_1 = """%s
 Disassembly of <code object foo at 0x..., file "%s", line %d>:
-None           COPY_FREE_VARS           1
+  --           COPY_FREE_VARS           1
                MAKE_CELL                0 (x)
 
 %4d           RESUME                   0
@@ -779,7 +779,7 @@ def foo(x):
 
 dis_nested_2 = """%s
 Disassembly of <code object <genexpr> at 0x..., file "%s", line %d>:
-None           COPY_FREE_VARS           1
+  --           COPY_FREE_VARS           1
 
 %4d           RETURN_GENERATOR
                POP_TOP
@@ -797,7 +797,7 @@ def foo(x):
        L3:     END_FOR
                RETURN_CONST             0 (None)
 
-None   L4:     CALL_INTRINSIC_1         3 (INTRINSIC_STOPITERATION_ERROR)
+  --   L4:     CALL_INTRINSIC_1         3 (INTRINSIC_STOPITERATION_ERROR)
                RERAISE                  1
 ExceptionTable:
   L1 to L4 -> L4 [0] lasti
diff --git a/Misc/NEWS.d/next/Library/2023-11-23-12-37-22.gh-issue-112137.kM46Q6.rst b/Misc/NEWS.d/next/Library/2023-11-23-12-37-22.gh-issue-112137.kM46Q6.rst
new file mode 100644
index 00000000000000..1b2e41ae96ff09
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-11-23-12-37-22.gh-issue-112137.kM46Q6.rst
@@ -0,0 +1 @@
+Change :mod:`dis` output to display no-lineno as "--" instead of "None".

From dc0adb44d8d4a33121deaad398f24b5d8ae36d19 Mon Sep 17 00:00:00 2001
From: Tian Gao <gaogaotiantian@hotmail.com>
Date: Thu, 23 Nov 2023 10:31:03 -0800
Subject: [PATCH 09/18] Add extra tests for `random.binomialvariate`
 (gh-112325)

---
 Lib/test/test_random.py                                       | 4 ++++
 .../Library/2023-11-22-23-08-47.gh-issue-81620.mfZ2Wf.rst     | 1 +
 2 files changed, 5 insertions(+)
 create mode 100644 Misc/NEWS.d/next/Library/2023-11-22-23-08-47.gh-issue-81620.mfZ2Wf.rst

diff --git a/Lib/test/test_random.py b/Lib/test/test_random.py
index 50bea7be6d54c7..b1e4ef4197d130 100644
--- a/Lib/test/test_random.py
+++ b/Lib/test/test_random.py
@@ -1081,6 +1081,7 @@ def test_binomialvariate(self):
             B(n=1, p=-0.5)                     # Negative p
         with self.assertRaises(ValueError):
             B(n=1, p=1.5)                      # p > 1.0
+        self.assertEqual(B(0, 0.5), 0)         # n == 0
         self.assertEqual(B(10, 0.0), 0)        # p == 0.0
         self.assertEqual(B(10, 1.0), 10)       # p == 1.0
         self.assertTrue(B(1, 0.3) in {0, 1})   # n == 1 fast path
@@ -1088,6 +1089,9 @@ def test_binomialvariate(self):
         self.assertTrue(B(1, 0.0) in {0})      # n == 1 fast path
         self.assertTrue(B(1, 1.0) in {1})      # n == 1 fast path
 
+        # BG method very small p
+        self.assertEqual(B(5, 1e-18), 0)
+
         # BG method p <= 0.5 and n*p=1.25
         self.assertTrue(B(5, 0.25) in set(range(6)))
 
diff --git a/Misc/NEWS.d/next/Library/2023-11-22-23-08-47.gh-issue-81620.mfZ2Wf.rst b/Misc/NEWS.d/next/Library/2023-11-22-23-08-47.gh-issue-81620.mfZ2Wf.rst
new file mode 100644
index 00000000000000..ff35806e4d5ed6
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-11-22-23-08-47.gh-issue-81620.mfZ2Wf.rst
@@ -0,0 +1 @@
+Add extra tests for :func:`random.binomialvariate`

From d9fc15222e96942e30ea8b0561dec5c82ecb4663 Mon Sep 17 00:00:00 2001
From: Raymond Hettinger <rhettinger@users.noreply.github.com>
Date: Thu, 23 Nov 2023 21:16:00 +0000
Subject: [PATCH 10/18] Remove bogus annotations from the descriptor howto
 guide (#112349)

---
 Doc/howto/descriptor.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Doc/howto/descriptor.rst b/Doc/howto/descriptor.rst
index 90d67d84d0ef08..69cf066190bc2f 100644
--- a/Doc/howto/descriptor.rst
+++ b/Doc/howto/descriptor.rst
@@ -521,11 +521,11 @@ everyday Python programs.
 Descriptor protocol
 -------------------
 
-``descr.__get__(self, obj, type=None) -> value``
+``descr.__get__(self, obj, type=None)``
 
-``descr.__set__(self, obj, value) -> None``
+``descr.__set__(self, obj, value)``
 
-``descr.__delete__(self, obj) -> None``
+``descr.__delete__(self, obj)``
 
 That is all there is to it.  Define any of these methods and an object is
 considered a descriptor and can override default behavior upon being looked up

From e9d1360c9a1072aa23950b321491dc542c3a19b8 Mon Sep 17 00:00:00 2001
From: Randolf Scholz <randolf.scholz@gmail.com>
Date: Fri, 24 Nov 2023 10:46:08 +0100
Subject: [PATCH 11/18] gh-112345: `typing.Protocol`: Let failed subclasscheck
 show non-method members (#112344)

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
---
 Lib/test/test_typing.py                          | 16 ++++++++++++++++
 Lib/typing.py                                    |  7 ++++++-
 ...023-11-23-17-25-27.gh-issue-112345.FFApHx.rst |  3 +++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 Misc/NEWS.d/next/Library/2023-11-23-17-25-27.gh-issue-112345.FFApHx.rst

diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py
index 2b5f34b4b92e0c..31d7fda2f978da 100644
--- a/Lib/test/test_typing.py
+++ b/Lib/test/test_typing.py
@@ -4091,6 +4091,22 @@ def method(self) -> None: ...
         self.assertIsInstance(Foo(), ProtocolWithMixedMembers)
         self.assertNotIsInstance(42, ProtocolWithMixedMembers)
 
+    def test_protocol_issubclass_error_message(self):
+        class Vec2D(Protocol):
+            x: float
+            y: float
+
+            def square_norm(self) -> float:
+                return self.x ** 2 + self.y ** 2
+
+        self.assertEqual(Vec2D.__protocol_attrs__, {'x', 'y', 'square_norm'})
+        expected_error_message = (
+            "Protocols with non-method members don't support issubclass()."
+            " Non-method members: 'x', 'y'."
+        )
+        with self.assertRaisesRegex(TypeError, re.escape(expected_error_message)):
+            issubclass(int, Vec2D)
+
 
 class GenericTests(BaseTestCase):
 
diff --git a/Lib/typing.py b/Lib/typing.py
index a96c7083eb785e..872aca82c4e779 100644
--- a/Lib/typing.py
+++ b/Lib/typing.py
@@ -1828,8 +1828,13 @@ def __subclasscheck__(cls, other):
                 not cls.__callable_proto_members_only__
                 and cls.__dict__.get("__subclasshook__") is _proto_hook
             ):
+                non_method_attrs = sorted(
+                    attr for attr in cls.__protocol_attrs__
+                    if not callable(getattr(cls, attr, None))
+                )
                 raise TypeError(
-                    "Protocols with non-method members don't support issubclass()"
+                    "Protocols with non-method members don't support issubclass()."
+                    f" Non-method members: {str(non_method_attrs)[1:-1]}."
                 )
             if not getattr(cls, '_is_runtime_protocol', False):
                 raise TypeError(
diff --git a/Misc/NEWS.d/next/Library/2023-11-23-17-25-27.gh-issue-112345.FFApHx.rst b/Misc/NEWS.d/next/Library/2023-11-23-17-25-27.gh-issue-112345.FFApHx.rst
new file mode 100644
index 00000000000000..b2b9894e6bef3a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-11-23-17-25-27.gh-issue-112345.FFApHx.rst
@@ -0,0 +1,3 @@
+Improve error message when trying to call :func:`issubclass` against a
+:class:`typing.Protocol` that has non-method members.
+Patch by Randolf Scholz.

From 4ec849bba8286b2ca979f557f633582174a8c4d8 Mon Sep 17 00:00:00 2001
From: Donghee Na <donghee.na@python.org>
Date: Fri, 24 Nov 2023 15:58:39 +0000
Subject: [PATCH 12/18] gh-112213: Add missing declaration of
 target_critical_section (gh-112374)

Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
---
 Tools/clinic/clinic.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Tools/clinic/clinic.py b/Tools/clinic/clinic.py
index b1dfcfea92a0d0..c0830864175adf 100755
--- a/Tools/clinic/clinic.py
+++ b/Tools/clinic/clinic.py
@@ -5135,9 +5135,11 @@ class DSLParser:
     indent: IndentStack
     kind: FunctionKind
     coexist: bool
+    forced_text_signature: str | None
     parameter_continuation: str
     preserve_output: bool
     critical_section: bool
+    target_critical_section: list[str]
     from_version_re = re.compile(r'([*/]) +\[from +(.+)\]')
 
     def __init__(self, clinic: Clinic) -> None:
@@ -5169,11 +5171,11 @@ def reset(self) -> None:
         self.indent = IndentStack()
         self.kind = CALLABLE
         self.coexist = False
-        self.forced_text_signature: str | None = None
+        self.forced_text_signature = None
         self.parameter_continuation = ''
         self.preserve_output = False
         self.critical_section = False
-        self.target_critical_section: list[str] = []
+        self.target_critical_section = []
 
     def directive_version(self, required: str) -> None:
         global version

From fafae08cc7caa25f2bd6b29106b50ef76c3e296f Mon Sep 17 00:00:00 2001
From: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Date: Fri, 24 Nov 2023 17:59:41 +0000
Subject: [PATCH 13/18] gh-59254: mention in open() doc that line buffering is
 for writing (#112318)

---
 Doc/library/functions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Doc/library/functions.rst b/Doc/library/functions.rst
index a72f779f69714a..b2dd32f925ef4d 100644
--- a/Doc/library/functions.rst
+++ b/Doc/library/functions.rst
@@ -1221,7 +1221,7 @@ are always available.  They are listed here in alphabetical order.
 
    *buffering* is an optional integer used to set the buffering policy.  Pass 0
    to switch buffering off (only allowed in binary mode), 1 to select line
-   buffering (only usable in text mode), and an integer > 1 to indicate the size
+   buffering (only usable when writing in text mode), and an integer > 1 to indicate the size
    in bytes of a fixed-size chunk buffer. Note that specifying a buffer size this
    way applies for binary buffered I/O, but ``TextIOWrapper`` (i.e., files opened
    with ``mode='r+'``) would have another buffering. To disable buffering in

From 9eb3b35dd7d72ff73005abf20266a618215b9ae0 Mon Sep 17 00:00:00 2001
From: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Date: Fri, 24 Nov 2023 18:13:25 +0000
Subject: [PATCH 14/18] gh-112355: fix calculation of jump target of
 ENTER_EXECUTOR in dis (#112377)

---
 Lib/dis.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Lib/dis.py b/Lib/dis.py
index c8313ac15a05c1..e08e9a94057689 100644
--- a/Lib/dis.py
+++ b/Lib/dis.py
@@ -30,6 +30,7 @@
 SET_FUNCTION_ATTRIBUTE = opmap['SET_FUNCTION_ATTRIBUTE']
 FUNCTION_ATTR_FLAGS = ('defaults', 'kwdefaults', 'annotations', 'closure')
 
+ENTER_EXECUTOR = opmap['ENTER_EXECUTOR']
 LOAD_CONST = opmap['LOAD_CONST']
 RETURN_CONST = opmap['RETURN_CONST']
 LOAD_GLOBAL = opmap['LOAD_GLOBAL']
@@ -373,6 +374,8 @@ def _get_argval_argrepr(op, arg, offset, co_consts, names, varname_from_oparg,
                 argval = offset + 2 + signed_arg*2
                 caches = _get_cache_size(_all_opname[deop])
                 argval += 2 * caches
+                if deop == ENTER_EXECUTOR:
+                    argval += 2
                 argrepr = f"to L{labels_map[argval]}"
             elif deop in (LOAD_FAST_LOAD_FAST, STORE_FAST_LOAD_FAST, STORE_FAST_STORE_FAST):
                 arg1 = arg >> 4
@@ -605,7 +608,9 @@ def _parse_exception_table(code):
         return entries
 
 def _is_backward_jump(op):
-    return 'JUMP_BACKWARD' in opname[op]
+    return opname[op] in ('JUMP_BACKWARD',
+                          'JUMP_BACKWARD_NO_INTERRUPT',
+                          'ENTER_EXECUTOR')
 
 def _get_instructions_bytes(code, varname_from_oparg=None,
                             names=None, co_consts=None,

From d525d01e2794e7e736527eaa7ee309ca1252f5bd Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Sat, 25 Nov 2023 08:17:31 +0200
Subject: [PATCH 15/18] gh-101100: Define `test.regrtest` module to fix
 references (#112381)

Define test.regrtest module to fix references
---
 Doc/library/test.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Doc/library/test.rst b/Doc/library/test.rst
index 7a8d38685b984c..6cbdc39b3c024d 100644
--- a/Doc/library/test.rst
+++ b/Doc/library/test.rst
@@ -159,6 +159,9 @@ guidelines to be followed:
 Running tests using the command-line interface
 ----------------------------------------------
 
+.. module:: test.regrtest
+   :synopsis: Drives the regression test suite.
+
 The :mod:`test` package can be run as a script to drive Python's regression
 test suite, thanks to the :option:`-m` option: :program:`python -m test`. Under
 the hood, it uses :mod:`test.regrtest`; the call :program:`python -m

From 6b961b8ceaba372b78d03feaceb4837bf7236694 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Sat, 25 Nov 2023 08:18:02 +0200
Subject: [PATCH 16/18] gh-101100: Define `_tkinter` module to fix references
 (#112382)

Define _tkinter module to fix references
---
 Doc/library/tkinter.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Doc/library/tkinter.rst b/Doc/library/tkinter.rst
index 5fab26db67633c..a8c67b02a23e4d 100644
--- a/Doc/library/tkinter.rst
+++ b/Doc/library/tkinter.rst
@@ -232,6 +232,9 @@ The modules that provide Tk support include:
 
 Additional modules:
 
+.. module:: _tkinter
+   :synopsis: A binary module that contains the low-level interface to Tcl/Tk.
+
 :mod:`_tkinter`
    A binary module that contains the low-level interface to Tcl/Tk.
    It is automatically imported by the main :mod:`tkinter` module,

From 19a1fc1b3df30f64450d157dc3a5d40c992e347f Mon Sep 17 00:00:00 2001
From: Barney Gale <barney.gale@gmail.com>
Date: Sat, 25 Nov 2023 17:19:38 +0000
Subject: [PATCH 17/18] GH-112361: Speed up pathlib by removing some temporary
 objects. (#112362)

Construct only one new list object (using `list.copy()`) when creating a
new path object with a modified tail. This slightly speeds up
`with_name()` and `with_suffix()`
---
 Lib/pathlib.py                                | 32 +++++++------------
 Lib/test/test_pathlib.py                      |  2 --
 ...-11-24-09-27-01.gh-issue-112361.kYtnHW.rst |  2 ++
 3 files changed, 14 insertions(+), 22 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2023-11-24-09-27-01.gh-issue-112361.kYtnHW.rst

diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index 9bce5320ef68e9..32ccf818b157c5 100644
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -400,13 +400,14 @@ def stem(self):
 
     def with_name(self, name):
         """Return a new path with the file name changed."""
-        if not self.name:
-            raise ValueError("%r has an empty name" % (self,))
         m = self.pathmod
         if not name or m.sep in name or (m.altsep and m.altsep in name) or name == '.':
-            raise ValueError("Invalid name %r" % (name))
-        return self._from_parsed_parts(self.drive, self.root,
-                                       self._tail[:-1] + [name])
+            raise ValueError(f"Invalid name {name!r}")
+        tail = self._tail.copy()
+        if not tail:
+            raise ValueError(f"{self!r} has an empty name")
+        tail[-1] = name
+        return self._from_parsed_parts(self.drive, self.root, tail)
 
     def with_stem(self, stem):
         """Return a new path with the stem changed."""
@@ -417,21 +418,12 @@ def with_suffix(self, suffix):
         has no suffix, add given suffix.  If the given suffix is an empty
         string, remove the suffix from the path.
         """
-        m = self.pathmod
-        if m.sep in suffix or m.altsep and m.altsep in suffix:
-            raise ValueError("Invalid suffix %r" % (suffix,))
-        if suffix and not suffix.startswith('.') or suffix == '.':
-            raise ValueError("Invalid suffix %r" % (suffix))
-        name = self.name
-        if not name:
-            raise ValueError("%r has an empty name" % (self,))
-        old_suffix = self.suffix
-        if not old_suffix:
-            name = name + suffix
+        if not suffix:
+            return self.with_name(self.stem)
+        elif suffix.startswith('.') and len(suffix) > 1:
+            return self.with_name(self.stem + suffix)
         else:
-            name = name[:-len(old_suffix)] + suffix
-        return self._from_parsed_parts(self.drive, self.root,
-                                       self._tail[:-1] + [name])
+            raise ValueError(f"Invalid suffix {suffix!r}")
 
     def relative_to(self, other, /, *_deprecated, walk_up=False):
         """Return the relative path to another path identified by the passed
@@ -1029,7 +1021,7 @@ def _glob(self, pattern, case_sensitive, follow_symlinks):
         elif not path_pattern._tail:
             raise ValueError("Unacceptable pattern: {!r}".format(pattern))
 
-        pattern_parts = list(path_pattern._tail)
+        pattern_parts = path_pattern._tail.copy()
         if pattern[-1] in (self.pathmod.sep, self.pathmod.altsep):
             # GH-65238: pathlib doesn't preserve trailing slash. Add it back.
             pattern_parts.append('')
diff --git a/Lib/test/test_pathlib.py b/Lib/test/test_pathlib.py
index e1121a9d76c040..427e082f3e16cb 100644
--- a/Lib/test/test_pathlib.py
+++ b/Lib/test/test_pathlib.py
@@ -575,8 +575,6 @@ def test_with_suffix_common(self):
         self.assertRaises(ValueError, P('a/b').with_suffix, '.c/.d')
         self.assertRaises(ValueError, P('a/b').with_suffix, './.d')
         self.assertRaises(ValueError, P('a/b').with_suffix, '.d/.')
-        self.assertRaises(ValueError, P('a/b').with_suffix,
-                          (self.pathmod.sep, 'd'))
 
     def test_relative_to_common(self):
         P = self.cls
diff --git a/Misc/NEWS.d/next/Library/2023-11-24-09-27-01.gh-issue-112361.kYtnHW.rst b/Misc/NEWS.d/next/Library/2023-11-24-09-27-01.gh-issue-112361.kYtnHW.rst
new file mode 100644
index 00000000000000..5a83f93f9fbec8
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-11-24-09-27-01.gh-issue-112361.kYtnHW.rst
@@ -0,0 +1,2 @@
+Speed up a small handful of :mod:`pathlib` methods by removing some
+temporary objects.

From fbb9027a037ff1bfaf3f596df033ca45743ee980 Mon Sep 17 00:00:00 2001
From: Irit Katriel <1055913+iritkatriel@users.noreply.github.com>
Date: Sat, 25 Nov 2023 17:23:43 +0000
Subject: [PATCH 18/18] gh-94722: fix DocTest.__eq__ for case of no line number
 on one side (#112385)

---
 Lib/doctest.py                                  |  6 ++++--
 Lib/test/test_doctest.py                        | 17 +++++++++++++++++
 ...023-11-24-21-00-24.gh-issue-94722.GMIQIn.rst |  2 ++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Library/2023-11-24-21-00-24.gh-issue-94722.GMIQIn.rst

diff --git a/Lib/doctest.py b/Lib/doctest.py
index 2f14aa08334895..d109b6c9e37343 100644
--- a/Lib/doctest.py
+++ b/Lib/doctest.py
@@ -591,9 +591,11 @@ def __hash__(self):
     def __lt__(self, other):
         if not isinstance(other, DocTest):
             return NotImplemented
-        return ((self.name, self.filename, self.lineno, id(self))
+        self_lno = self.lineno if self.lineno is not None else -1
+        other_lno = other.lineno if other.lineno is not None else -1
+        return ((self.name, self.filename, self_lno, id(self))
                 <
-                (other.name, other.filename, other.lineno, id(other)))
+                (other.name, other.filename, other_lno, id(other)))
 
 ######################################################################
 ## 3. DocTestParser
diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py
index cb4e2157bb228b..772dbd1d021305 100644
--- a/Lib/test/test_doctest.py
+++ b/Lib/test/test_doctest.py
@@ -413,6 +413,23 @@ def test_DocTest(): r"""
     False
     >>> test != other_test
     True
+    >>> test < other_test
+    False
+    >>> other_test < test
+    True
+
+Test comparison with lineno None on one side
+
+    >>> no_lineno = parser.get_doctest(docstring, globs, 'some_test',
+    ...                               'some_test', None)
+    >>> test.lineno is None
+    False
+    >>> no_lineno.lineno is None
+    True
+    >>> test < no_lineno
+    False
+    >>> no_lineno < test
+    True
 
 Compare `DocTestCase`:
 
diff --git a/Misc/NEWS.d/next/Library/2023-11-24-21-00-24.gh-issue-94722.GMIQIn.rst b/Misc/NEWS.d/next/Library/2023-11-24-21-00-24.gh-issue-94722.GMIQIn.rst
new file mode 100644
index 00000000000000..41bd57f46ed82a
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-11-24-21-00-24.gh-issue-94722.GMIQIn.rst
@@ -0,0 +1,2 @@
+Fix bug where comparison between instances of :class:`~doctest.DocTest` fails if
+one of them has ``None`` as its lineno.