[Python-checkins] cpython: Issue #24268: Fix import naming when loading extension modules. Patch by Petr
steve.dower
python-checkins at python.org
Sat May 23 23:14:16 CEST 2015
https://hg.python.org/cpython/rev/7b5f5f8b26a6
changeset: 96250:7b5f5f8b26a6
user: Steve Dower <steve.dower at microsoft.com>
date: Sat May 23 14:13:41 2015 -0700
summary:
Issue #24268: Fix import naming when loading extension modules. Patch by Petr Viktorin.
files:
Python/dynload_dl.c | 2 +-
Python/dynload_hpux.c | 4 ++--
Python/dynload_next.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Python/dynload_dl.c b/Python/dynload_dl.c
--- a/Python/dynload_dl.c
+++ b/Python/dynload_dl.c
@@ -18,6 +18,6 @@
{
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);
}
diff --git a/Python/dynload_hpux.c b/Python/dynload_hpux.c
--- 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};
diff --git a/Python/dynload_next.c b/Python/dynload_next.c
--- a/Python/dynload_next.c
+++ b/Python/dynload_next.c
@@ -40,7 +40,7 @@
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)) {
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list