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

diff --git a/Doc/library/tracemalloc.rst b/Doc/library/tracemalloc.rst
index fba1caab455d73e77e27972e4149140a99572791..20f668c72820282bf31f896f01e1f59305dd1951 100644 (file)
--- 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 8a6b02179db176eb98e9c75bff88c1f6d93f5c68..95c5aa7ec6e6b289094a8ae05b04c112c8766d69 100644 (file)
--- 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 a468130af10838da2c4d79e3cd345973ac8acf81..ccc84cced1090b2fa0f36546c4c75a431d7b36ce 100644 (file)
--- 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 (file)
index bb2e745..0000000
--- 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.