[Python-checkins] bpo-40630: adjust tracemalloc.reset_peak docs for backport to 3.9 (GH-20546)

[Huon Wilson]

https://github.com/python/cpython/commit/39de8e4b6f139f8d8284732bd7bb6e5ccced29fa
commit: 39de8e4b6f139f8d8284732bd7bb6e5ccced29fa
branch: master
author: Huon Wilson <wilson.huon at gmail.com>
committer: GitHub <noreply at github.com>
date: 2020-06-01T19:26:33+02:00
summary:

bpo-40630: adjust tracemalloc.reset_peak docs for backport to 3.9 (GH-20546)

files:
D Misc/NEWS.d/next/Library/2020-05-15-13-40-15.bpo-40630.YXEX_M.rst
M Doc/library/tracemalloc.rst
M Doc/whatsnew/3.10.rst
M Doc/whatsnew/3.9.rst

diff --git a/Doc/library/tracemalloc.rst b/Doc/library/tracemalloc.rst
index fba1caab455d7..20f668c728202 100644
--- a/Doc/library/tracemalloc.rst
+++ b/Doc/library/tracemalloc.rst
@@ -345,7 +345,7 @@ Functions
 
    See also :func:`get_traced_memory`.
 
-   .. versionadded:: 3.10
+   .. versionadded:: 3.9
 
 
 .. function:: get_tracemalloc_memory()
diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst
index 8a6b02179db17..95c5aa7ec6e6b 100644
--- a/Doc/whatsnew/3.10.rst
+++ b/Doc/whatsnew/3.10.rst
@@ -95,13 +95,6 @@ New Modules
 Improved Modules
 ================
 
-tracemalloc
------------
-
-Added :func:`tracemalloc.reset_peak` to set the peak size of traced memory
-blocks to the current size, to measure the peak of specific pieces of code.
-(Contributed by Huon Wilson in :issue:`40630`.)
-
 Optimizations
 =============
 
diff --git a/Doc/whatsnew/3.9.rst b/Doc/whatsnew/3.9.rst
index a468130af1083..ccc84cced1090 100644
--- a/Doc/whatsnew/3.9.rst
+++ b/Doc/whatsnew/3.9.rst
@@ -562,6 +562,12 @@ Previously, :attr:`sys.stderr` was block-buffered when non-interactive. Now
 ``stderr`` defaults to always being line-buffered.
 (Contributed by Jendrik Seipp in :issue:`13601`.)
 
+tracemalloc
+-----------
+
+Added :func:`tracemalloc.reset_peak` to set the peak size of traced memory
+blocks to the current size, to measure the peak of specific pieces of code.
+(Contributed by Huon Wilson in :issue:`40630`.)
 
 typing
 ------
diff --git a/Misc/NEWS.d/next/Library/2020-05-15-13-40-15.bpo-40630.YXEX_M.rst b/Misc/NEWS.d/next/Library/2020-05-15-13-40-15.bpo-40630.YXEX_M.rst
deleted file mode 100644
index bb2e7452d3cfb..0000000000000
--- a/Misc/NEWS.d/next/Library/2020-05-15-13-40-15.bpo-40630.YXEX_M.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Added :func:`tracemalloc.reset_peak` to set the peak size of traced memory
-blocks to the current size, to measure the peak of specific pieces of code.