Oops -- overuse of dabbrev-expand introduced a strange bug, where

instead of 'locals' I was passing 'lock_import' to import_module_ex().

diff --git a/Python/import.c b/Python/import.c
index ef8243948815b3471bc135f6027185b24fc82599..edc960c1f91f5b004b99aa61af2709067cc54077 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -1373,7 +1373,7 @@ PyImport_ImportModuleEx(name, globals, locals, fromlist)
 {
        PyObject *result;
        lock_import();
-       result = import_module_ex(name, globals, lock_import, fromlist);
+       result = import_module_ex(name, globals, locals, fromlist);
        unlock_import();
        return result;
 }