diff options
author | Antoine Pitrou <solipsis@pitrou.net> | 2012-08-04 00:56:19 +0200 |
---|---|---|
committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-08-04 00:56:19 +0200 |
commit | b0f1dbb51e0c28a801c8c3e9992453de14c5e436 (patch) | |
tree | dad2470e591823bf79bc9ea8a5a7923b928e9f4a /Python/dynload_hpux.c | |
parent | 8cc05cc705495cfb6bf6a35600ba9a4a4c9e2b2c (diff) | |
parent | 6a18048c636a6fcc31c56906952f1e470cb5412b (diff) | |
download | cpython-b0f1dbb51e0c28a801c8c3e9992453de14c5e436.tar.gz |
Make TextIOWrapper's documentation clearer by copying the newline argument's description from open().
Diffstat (limited to 'Python/dynload_hpux.c')
-rw-r--r-- | Python/dynload_hpux.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/Python/dynload_hpux.c b/Python/dynload_hpux.c index 18a81377f2..c9554148cc 100644 --- a/Python/dynload_hpux.c +++ b/Python/dynload_hpux.c @@ -13,13 +13,9 @@ #define FUNCNAME_PATTERN "PyInit_%.200s" #endif -const struct filedescr _PyImport_DynLoadFiletab[] = { - {SHLIB_EXT, "rb", C_EXTENSION}, - {"module"SHLIB_EXT, "rb", C_EXTENSION}, - {0, 0} -}; +const char *_PyImport_DynLoadFiletab[] = {SHLIB_EXT, NULL}; -dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, const char *shortname, +dl_funcptr _PyImport_GetDynLoadFunc(const char *shortname, const char *pathname, FILE *fp) { dl_funcptr p; @@ -37,11 +33,21 @@ dl_funcptr _PyImport_GetDynLoadFunc(const char *fqname, 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); |