From 3eee54ef71268bda903e56280e2f96e89e9471dd Mon Sep 17 00:00:00 2001 From: Huon Wilson Date: Sun, 31 May 2020 09:50:55 +1000 Subject: [PATCH] bpo-40630: adjust tracemalloc.reset_peak docs for backport to 3.9 --- 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 fba1caab455d73e..20f668c72820282 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 8a6b02179db176e..95c5aa7ec6e6b28 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 7f81074b2b55feb..01b31f624c32df8 100644 --- a/Doc/whatsnew/3.9.rst +++ b/Doc/whatsnew/3.9.rst @@ -561,6 +561,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 bb2e7452d3cfbe8..000000000000000 --- 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.