summaryrefslogtreecommitdiffstats
path: root/Doc/c-api
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2012-04-17 21:57:09 (GMT)
committerBrian Curtin <brian@python.org>2012-04-17 21:57:09 (GMT)
commit09b86d1196427f2028d7e072b106847d8c693815 (patch)
treec06e9fe5b6a732d07f2987ff86081165bd69ebf5 /Doc/c-api
parentfba807ac44ff6804dd1be7c3962fc3455c8e7763 (diff)
downloadcpython-09b86d1196427f2028d7e072b106847d8c693815.zip
cpython-09b86d1196427f2028d7e072b106847d8c693815.tar.gz
cpython-09b86d1196427f2028d7e072b106847d8c693815.tar.bz2
Fix #14600. Correct reference handling and naming of ImportError convenience function
Diffstat (limited to 'Doc/c-api')
-rw-r--r--Doc/c-api/exceptions.rst23
1 files changed, 4 insertions, 19 deletions
diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
index d081ff6..877249b 100644
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -229,27 +229,12 @@ in various ways. There is a separate error indicator for each thread.
Similar to :c:func:`PyErr_SetFromWindowsErrWithFilename`, with an additional
parameter specifying the exception type to be raised. Availability: Windows.
-.. c:function:: PyObject* PyErr_SetExcWithArgsKwargs(PyObject *exc, PyObject *args, PyObject *kwargs)
-
- This is a convenience function to set an *exc* with the given *args* and
- *kwargs* values. If *args* is ``NULL``, an empty :func:`tuple` will be
- created when *exc* is created via :c:func:`PyObject_Call`.
-
- .. versionadded:: 3.3
-
-.. c:function:: PyObject* PyErr_SetFromImportErrorWithName(PyObject *msg, PyObject *name)
-
- This is a convenience function to raise :exc:`ImportError`. *msg* will be
- set as the exception's message string, and *name* will be set as the
- :exc:`ImportError`'s ``name`` attribute.
-
- .. versionadded:: 3.3
-
-.. c:function:: PyObject* PyErr_SetFromImportErrorWithNameAndPath(PyObject *msg, PyObject *name, PyObject *path)
+.. c:function:: PyObject* PyErr_SetImportError(PyObject *msg, PyObject *name, PyObject *path)
This is a convenience function to raise :exc:`ImportError`. *msg* will be
- set as the exception's message string. Both *name* and *path* will be set
- as the :exc:`ImportError`'s respective ``name`` and ``path`` attributes.
+ set as the exception's message string. *name* and *path*, both of which can
+ be ``NULL``, will be set as the :exc:`ImportError`'s respective ``name``
+ and ``path`` attributes.
.. versionadded:: 3.3