From 878027f66475996d98a264b90b824518d9030d35 Mon Sep 17 00:00:00 2001 From: Xiang Zhang Date: Sun, 28 Jan 2018 00:21:04 +0800 Subject: [PATCH 1/2] bpo-32687: Fix wrong meaning of args for PyTrace_LINE/CALL in doc --- Doc/c-api/init.rst | 4 ++-- .../Documentation/2018-01-28-00-25-14.bpo-32687.T_2dJN.rst | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 Misc/NEWS.d/next/Documentation/2018-01-28-00-25-14.bpo-32687.T_2dJN.rst diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst index 86faf47f53bc54..9887d28b09d905 100644 --- a/Doc/c-api/init.rst +++ b/Doc/c-api/init.rst @@ -1283,12 +1283,12 @@ Python-level trace functions in previous versions. +------------------------------+--------------------------------------+ | Value of *what* | Meaning of *arg* | +==============================+======================================+ - | :const:`PyTrace_CALL` | Always *NULL*. | + | :const:`PyTrace_CALL` | Always :c:data:`Py_None`. | +------------------------------+--------------------------------------+ | :const:`PyTrace_EXCEPTION` | Exception information as returned by | | | :func:`sys.exc_info`. | +------------------------------+--------------------------------------+ - | :const:`PyTrace_LINE` | Always *NULL*. | + | :const:`PyTrace_LINE` | Always :c:data:`Py_None`. | +------------------------------+--------------------------------------+ | :const:`PyTrace_RETURN` | Value being returned to the caller, | | | or *NULL* if caused by an exception. | diff --git a/Misc/NEWS.d/next/Documentation/2018-01-28-00-25-14.bpo-32687.T_2dJN.rst b/Misc/NEWS.d/next/Documentation/2018-01-28-00-25-14.bpo-32687.T_2dJN.rst new file mode 100644 index 00000000000000..76b4e8e4d0f1b2 --- /dev/null +++ b/Misc/NEWS.d/next/Documentation/2018-01-28-00-25-14.bpo-32687.T_2dJN.rst @@ -0,0 +1 @@ +Fix wrong meaning of args for PyTrace_LINE and PyTrace_CALL. From 3a0bbe7a79d86620d914983d95b07e00c1adac37 Mon Sep 17 00:00:00 2001 From: Xiang Zhang Date: Sun, 28 Jan 2018 14:59:05 +0800 Subject: [PATCH 2/2] rm NEWs entrty --- .../next/Documentation/2018-01-28-00-25-14.bpo-32687.T_2dJN.rst | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Misc/NEWS.d/next/Documentation/2018-01-28-00-25-14.bpo-32687.T_2dJN.rst diff --git a/Misc/NEWS.d/next/Documentation/2018-01-28-00-25-14.bpo-32687.T_2dJN.rst b/Misc/NEWS.d/next/Documentation/2018-01-28-00-25-14.bpo-32687.T_2dJN.rst deleted file mode 100644 index 76b4e8e4d0f1b2..00000000000000 --- a/Misc/NEWS.d/next/Documentation/2018-01-28-00-25-14.bpo-32687.T_2dJN.rst +++ /dev/null @@ -1 +0,0 @@ -Fix wrong meaning of args for PyTrace_LINE and PyTrace_CALL.