summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuon Wilson <wilson.huon@gmail.com>2020-06-01 17:26:33 (GMT)
committerGitHub <noreply@github.com>2020-06-01 17:26:33 (GMT)
commit39de8e4b6f139f8d8284732bd7bb6e5ccced29fa (patch)
treea2da414bb746196b67df7cbf00fbec8227dfd469
parent06e3a27a3c863495390a07c695171a8e62a6e0d2 (diff)
downloadcpython-39de8e4b6f139f8d8284732bd7bb6e5ccced29fa.zip
cpython-39de8e4b6f139f8d8284732bd7bb6e5ccced29fa.tar.gz
cpython-39de8e4b6f139f8d8284732bd7bb6e5ccced29fa.tar.bz2
bpo-40630: adjust tracemalloc.reset_peak docs for backport to 3.9 (GH-20546)
-rw-r--r--Doc/library/tracemalloc.rst2
-rw-r--r--Doc/whatsnew/3.10.rst7
-rw-r--r--Doc/whatsnew/3.9.rst6
-rw-r--r--Misc/NEWS.d/next/Library/2020-05-15-13-40-15.bpo-40630.YXEX_M.rst2
4 files changed, 7 insertions, 10 deletions
diff --git a/Doc/library/tracemalloc.rst b/Doc/library/tracemalloc.rst
index fba1caa..20f668c 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 8a6b021..95c5aa7 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 a468130..ccc84cc 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 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.