From f5651ca6934912688e9176d187f0c22315c7c7cf Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Wed, 19 Nov 1997 18:53:33 +0000 Subject: Fix importing of shared libraries from inside packages. This is a bit of a hack: when the shared library is loaded, the module name is "package.module", but the module calls Py_InitModule*() with just "module" for the name. The shared library loader squirrels away the true name of the module in _Py_PackageContext, and Py_InitModule*() will substitute this (if the name actually matches). --- Python/importdl.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'Python/importdl.c') diff --git a/Python/importdl.c b/Python/importdl.c index fffe2654e7..7f35d13095 100644 --- a/Python/importdl.c +++ b/Python/importdl.c @@ -233,6 +233,7 @@ _PyImport_LoadDynamicModule(name, pathname, fp) #else PyObject *m, *d, *s; char funcname[258]; + char *lastdot, *shortname, *packagecontext; dl_funcptr p = NULL; #ifdef USE_SHLIB static struct { @@ -252,7 +253,16 @@ _PyImport_LoadDynamicModule(name, pathname, fp) Py_INCREF(m); return m; } - sprintf(funcname, FUNCNAME_PATTERN, name); + lastdot = strrchr(name, '.'); + if (lastdot == NULL) { + packagecontext = NULL; + shortname = name; + } + else { + packagecontext = name; + shortname = lastdot+1; + } + sprintf(funcname, FUNCNAME_PATTERN, shortname); #ifdef USE_SHLIB if (fp != NULL) { int i; @@ -519,11 +529,14 @@ _PyImport_LoadDynamicModule(name, pathname, fp) got_it: #endif if (p == NULL) { - PyErr_SetString(PyExc_ImportError, - "dynamic module does not define init function"); + PyErr_Format(PyExc_ImportError, + "dynamic module does not define init function (%s)", + funcname); return NULL; } + _Py_PackageContext = packagecontext; (*p)(); + _Py_PackageContext = NULL; if (PyErr_Occurred()) return NULL; if (_PyImport_FixupExtension(name, pathname) == NULL) -- cgit v1.2.1