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

brettcannon · brettcannon · commit 3dfc22cc048d · 2012-04-20T15:31:11.000-04:00
extension modules.
diff --git a/Python/dynload_aix.c b/Python/dynload_aix.c
@@ -108,6 +108,8 @@ aix_loaderror(const char *pathname)
 {
 
     char *message[1024], errbuf[1024];
+    PyObject *pathname_ob = NULL;
+    PyObject *errbuf_ob = NULL;
     register int i,j;
 
     struct errtab {
@@ -147,7 +149,11 @@ aix_loaderror(const char *pathname)
         ERRBUF_APPEND("\n");
     }
     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;
 }
 
diff --git a/Python/dynload_hpux.c b/Python/dynload_hpux.c
@@ -36,11 +36,21 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname,
     /* XXX Chuck Blake once wrote that 0 should be BIND_NOSTART? */
     if (lib == NULL) {
         char buf[256];
+        PyObject *pathname_ob = NULL;
+        PyObject *buf_ob = NULL;
+        PyObject *shortname_ob = NULL;
+
         if (Py_VerboseFlag)
             perror(pathname);
         PyOS_snprintf(buf, sizeof(buf), "Failed to load %.200s",
                       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;
     }
     PyOS_snprintf(funcname, sizeof(funcname), FUNCNAME_PATTERN, shortname);

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,8 @@ aix_loaderror(const char *pathname)`
`108`	`108`	`{`
`109`	`109`
`110`	`110`	`char *message[1024], errbuf[1024];`
	`111`	`+ PyObject *pathname_ob = NULL;`
	`112`	`+ PyObject *errbuf_ob = NULL;`
`111`	`113`	`register int i,j;`
`112`	`114`
`113`	`115`	`struct errtab {`
`@@ -147,7 +149,11 @@ aix_loaderror(const char *pathname)`
`147`	`149`	`ERRBUF_APPEND("\n");`
`148`	`150`	`}`
`149`	`151`	`errbuf[strlen(errbuf)-1] = '\0'; /* trim off last newline */`
`150`		`- PyErr_SetString(PyExc_ImportError, errbuf);`
	`152`	`+ pathname_ob = PyUnicode_FromString(pathname);`
	`153`	`+ errbuf_ob = PyUnicode_FromString(errbuf);`
	`154`	`+ PyErr_SetImportError(errbuf_ob, NULL, pathname);`
	`155`	`+ Py_DECREF(pathname_ob);`
	`156`	`+ Py_DECREF(errbuf_ob);`
`151`	`157`	`return;`
`152`	`158`	`}`
`153`	`159`