townforge/python
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed __module__ name extraction logic so that when a module is not initializing the module name comes from the global __name__.

Browse Source 
[SVN r8362]
This commit is contained in:
Dave Abrahams 2000-11-30 04:53:31 +00:00
parent 81cf5333c3
commit ff31b16285
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/classes.cpp
View File

@ -840,7 +840,27 @@ namespace {
void add_current_module_name(dictionary& name_space)
{
static string module_key("__module__", string::interned);
name_space.set_item(module_key, module_builder::name());
// If the user didn't specify a __module__ attribute already
if (name_space.get_item(module_key).get() == 0)
{
if (module_builder::initializing())
{
// The global __name__ is not properly set in this case
name_space.set_item(module_key, module_builder::name());
}
else
{
// Get the module name from the global __name__
PyObject *globals = PyEval_GetGlobals();
if (globals != NULL)
{
PyObject *module_name = PyDict_GetItemString(globals, "__name__");
if (module_name != NULL)
name_space.set_item(module_key, module_name);
}
}
}
}
}