summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1998-03-03 22:33:27 (GMT)
committerGuido van Rossum <guido@python.org>1998-03-03 22:33:27 (GMT)
commitd65911b3f3a2f8d72d170cc3537aa832d42591b6 (patch)
treec8a371406bfe272a0368b65cf6cb11837af0f13a
parent986c100735c7cdf5f63de8feec0263f46cd89480 (diff)
downloadcpython-d65911b3f3a2f8d72d170cc3537aa832d42591b6.zip
cpython-d65911b3f3a2f8d72d170cc3537aa832d42591b6.tar.gz
cpython-d65911b3f3a2f8d72d170cc3537aa832d42591b6.tar.bz2
Oops -- overuse of dabbrev-expand introduced a strange bug, where
instead of 'locals' I was passing 'lock_import' to import_module_ex().
-rw-r--r--Python/import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/import.c b/Python/import.c
index ef82439..edc960c 100644
--- 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;
}