From: Guido van Rossum <guido@python.org>
Date: Tue, 3 Mar 1998 22:33:27 +0000 (+0000)
Subject: Oops -- overuse of dabbrev-expand introduced a strange bug, where
X-Git-Tag: v1.5.1~519
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d65911b3f3a2f8d72d170cc3537aa832d42591b6;p=thirdparty%2FPython%2Fcpython.git

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 ef8243948815..edc960c1f91f 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;
 }