From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sun, 9 Feb 2014 00:57:34 +0000 (+1000)
Subject: Note the new debug assertion in PyObject_Str
X-Git-Tag: v3.4.0rc1~19
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d7b3641d3a97a2a3ee936f91fc3f9160c3d11f9;p=python

Note the new debug assertion in PyObject_Str
---

diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst
index be6d798f63..78c385e8ad 100644
--- a/Doc/c-api/object.rst
+++ b/Doc/c-api/object.rst
@@ -170,6 +170,10 @@ Object Protocol
    Python expression ``str(o)``.  Called by the :func:`str` built-in function
    and, therefore, by the :func:`print` function.
 
+   .. versionchanged:: 3.4
+      This function now includes a debug assertion that ensures it does not
+      silently discard an active exception.
+
 .. c:function:: PyObject* PyObject_Bytes(PyObject *o)
 
    .. index:: builtin: bytes
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 91fb03a00c..5da98daad2 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -1708,6 +1708,13 @@ Changes in the Python API
 Changes in the C API
 --------------------
 
+* :c:func:`PyObject_Str` now includes a debug assertion that ensures it will
+  no longer silently discard currently active exceptions. In cases where
+  discarding the active exception is expected and desired (for example,
+  because it has already been saved locally with :c:func:`PyErr_Fetch`), an
+  explicit :c:func:`PyErr_Clear` call will be needed to avoid triggering the
+  assertion.
+
 * :c:func:`PyErr_SetImportError` now sets :exc:`TypeError` when its **msg**
   argument is not set. Previously only ``NULL`` was returned with no exception
   set.