From 39de8e4b6f139f8d8284732bd7bb6e5ccced29fa Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Tue, 2 Jun 2020 03:26:33 +1000 Subject: [PATCH] bpo-40630: adjust tracemalloc.reset_peak docs for backport to 3.9 (GH-20546) --- Doc/library/tracemalloc.rst | 2 +- Doc/whatsnew/3.10.rst | 7 ------- Doc/whatsnew/3.9.rst | 6 ++++++ .../next/Library/2020-05-15-13-40-15.bpo-40630.YXEX_M.rst | 2 -- 4 files changed, 7 insertions(+), 10 deletions(-) delete mode 100644 Misc/NEWS.d/next/Library/2020-05-15-13-40-15.bpo-40630.YXEX_M.rst diff --git a/Doc/library/tracemalloc.rst b/Doc/library/tracemalloc.rst index fba1caab455..20f668c7282 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 8a6b02179db..95c5aa7ec6e 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 a468130af10..ccc84cced10 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 bb2e7452d3c..00000000000 --- 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.