mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-21 14:12:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #14599: Support ImportError.path on AIX and HPUX when loading

Browse source 
extension modules.
This commit is contained in:
Brett Cannon 2012-04-20 15:31:11 -04:00
parent fe3c62967b
commit 3dfc22cc04
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Python/dynload_aix.c
View file

@ -108,6 +108,8 @@ aix_loaderror(const char *pathname)
{ {
char *message[1024], errbuf[1024]; char *message[1024], errbuf[1024];
PyObject *pathname_ob = NULL;
PyObject *errbuf_ob = NULL;
register int i,j; register int i,j;
struct errtab { struct errtab {
@ -147,7 +149,11 @@ aix_loaderror(const char *pathname)
ERRBUF_APPEND("\n"); ERRBUF_APPEND("\n");
} }
errbuf[strlen(errbuf)-1] = '\0'; /* trim off last newline */ errbuf[strlen(errbuf)-1] = '\0'; /* trim off last newline */
PyErr_SetString(PyExc_ImportError, errbuf); pathname_ob = PyUnicode_FromString(pathname);
errbuf_ob = PyUnicode_FromString(errbuf);
PyErr_SetImportError(errbuf_ob, NULL, pathname);
Py_DECREF(pathname_ob);
Py_DECREF(errbuf_ob);
return; return;
} }

12
Python/dynload_hpux.c
View file

@ -36,11 +36,21 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
/* XXX Chuck Blake once wrote that 0 should be BIND_NOSTART? */ /* XXX Chuck Blake once wrote that 0 should be BIND_NOSTART? */
if (lib == NULL) { if (lib == NULL) {
char buf[256]; char buf[256];
PyObject *pathname_ob = NULL;
PyObject *buf_ob = NULL;
PyObject *shortname_ob = NULL;
if (Py_VerboseFlag) if (Py_VerboseFlag)
perror(pathname); perror(pathname);
PyOS_snprintf(buf, sizeof(buf), "Failed to load %.200s", PyOS_snprintf(buf, sizeof(buf), "Failed to load %.200s",
pathname); pathname);
PyErr_SetString(PyExc_ImportError, buf); buf_ob = PyUnicode_FromString(buf);
shortname_ob = PyUnicode_FromString(shortname);
pathname_ob = PyUnicode_FromString(pathname);
PyErr_SetImportError(buf_ob, shortname_ob, pathname_ob);
Py_DECREF(buf_ob);
Py_DECREF(shortname_ob);
Py_DECREF(pathname_ob);
return NULL; return NULL;
} }
PyOS_snprintf(funcname, sizeof(funcname), FUNCNAME_PATTERN, shortname); PyOS_snprintf(funcname, sizeof(funcname), FUNCNAME_PATTERN, shortname);