summaryrefslogtreecommitdiff
path: root/Include
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2009-12-28 08:41:01 +0000
committerGeorg Brandl <georg@python.org>2009-12-28 08:41:01 +0000
commit1e28a27f845a59513ad3bebbd6ae19f399071bbd (patch)
tree22f39f9b43f61a56fbcca9327b968685159e7f00 /Include
parent127d47092a98aa9b668dceb03c7b64d9c4c44adc (diff)
downloadcpython-git-1e28a27f845a59513ad3bebbd6ae19f399071bbd.tar.gz
Merged revisions 77088 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77088 | georg.brandl | 2009-12-28 09:34:58 +0100 (Mo, 28 Dez 2009) | 1 line #7033: add new API function PyErr_NewExceptionWithDoc, for easily giving new exceptions a docstring. ........
Diffstat (limited to 'Include')
-rw-r--r--Include/pyerrors.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index 7556e64469..a821e392e2 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -210,8 +210,10 @@ PyAPI_FUNC(void) _PyErr_BadInternalCall(const char *filename, int lineno);
#define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__)
/* Function to create a new exception */
-PyAPI_FUNC(PyObject *) PyErr_NewException(const char *name, PyObject *base,
- PyObject *dict);
+PyAPI_FUNC(PyObject *) PyErr_NewException(
+ const char *name, PyObject *base, PyObject *dict);
+PyAPI_FUNC(PyObject *) PyErr_NewExceptionWithDoc(
+ const char *name, const char *doc, PyObject *base, PyObject *dict);
PyAPI_FUNC(void) PyErr_WriteUnraisable(PyObject *);
/* In sigcheck.c or signalmodule.c */