cpython: 7b5f5f8b26a6 (original) (raw)

Mercurial > cpython

changeset 96250:7b5f5f8b26a6

Issue #24268: Fix import naming when loading extension modules. Patch by Petr Viktorin. [#24268]

Steve Dower steve.dower@microsoft.com
date	Sat, 23 May 2015 14:13:41 -0700
parents	664432718dcb
children	6c853a196a1b
files	Python/dynload_dl.c Python/dynload_hpux.c Python/dynload_next.c
diffstat	3 files changed, 4 insertions(+), 4 deletions(-)[+] [-] Python/dynload_dl.c 2 Python/dynload_hpux.c 4 Python/dynload_next.c 2

line wrap: on

line diff

--- a/Python/dynload_dl.c +++ b/Python/dynload_dl.c @@ -18,6 +18,6 @@ dl_funcptr _PyImport_FindSharedFuncptr(c { char funcname[258];

PyOS_snprintf(funcname, sizeof(funcname), "%20s_%.200s", prefix, shortname);

PyOS_snprintf(funcname, sizeof(funcname), "%.20s_%.200s", prefix, shortname); return dl_loadmod(Py_GetProgramName(), pathname, funcname); }

--- a/Python/dynload_hpux.c +++ b/Python/dynload_hpux.c @@ -8,9 +8,9 @@ #include "importdl.h" #if defined(hp9000s300) -#define FUNCNAME_PATTERN "%20s_%.200s" +#define FUNCNAME_PATTERN "_%.20s%.200s" #else -#define FUNCNAME_PATTERN "%20s_%.200s" +#define FUNCNAME_PATTERN "%.20s_%.200s" #endif const char *_PyImport_DynLoadFiletab[] = {SHLIB_EXT, NULL};

--- a/Python/dynload_next.c +++ b/Python/dynload_next.c @@ -40,7 +40,7 @@ dl_funcptr _PyImport_FindSharedFuncptr(c const char *errString; char errBuf[512];

PyOS_snprintf(funcname, sizeof(funcname), "%20s%.200s", prefix, shortname);

PyOS_snprintf(funcname, sizeof(funcname), "%.20s%.200s", prefix, shortname);

#ifdef USE_DYLD_GLOBAL_NAMESPACE if (NSIsSymbolNameDefined(funcname)) {