aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Curtin <brian@python.org>2012-04-17 16:57:09 -0500
committerBrian Curtin <brian@python.org>2012-04-17 16:57:09 -0500
commit09b86d1196427f2028d7e072b106847d8c693815 (patch)
treec06e9fe5b6a732d07f2987ff86081165bd69ebf5 /Include/pyerrors.h
parentIssue #5113: Fix a test_posix failure on HP-UX, where non-root users can (diff)
downloadcpython-09b86d1196427f2028d7e072b106847d8c693815.tar.gz
cpython-09b86d1196427f2028d7e072b106847d8c693815.tar.bz2
cpython-09b86d1196427f2028d7e072b106847d8c693815.zip
Fix #14600. Correct reference handling and naming of ImportError convenience function
Diffstat (limited to 'Include/pyerrors.h')
-rw-r--r--Include/pyerrors.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/Include/pyerrors.h b/Include/pyerrors.h
index 5aacf7ac8a0..458420aa323 100644
--- a/Include/pyerrors.h
+++ b/Include/pyerrors.h
@@ -265,9 +265,8 @@ PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int);
PyAPI_FUNC(PyObject *) PyErr_SetExcWithArgsKwargs(PyObject *, PyObject *,
PyObject *);
-PyAPI_FUNC(PyObject *) PyErr_SetFromImportErrorWithNameAndPath(PyObject *,
- PyObject *, PyObject *);
-PyAPI_FUNC(PyObject *) PyErr_SetFromImportErrorWithName(PyObject *, PyObject *);
+PyAPI_FUNC(PyObject *) PyErr_SetImportError(PyObject *, PyObject *,
+ PyObject *);
/* Export the old function so that the existing API remains available: */
PyAPI_FUNC(void) PyErr_BadInternalCall(void);