From: Ka-Ping Yee Date: Fri, 28 Mar 2003 16:29:50 +0000 (+0000) Subject: Make module lookup a little more robust (certain kinds of fiddling to X-Git-Tag: v2.3c1~1353 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b38bbbd387ff713f2b2676c253108b0747744d00;p=thirdparty%2FPython%2Fcpython.git Make module lookup a little more robust (certain kinds of fiddling to sys.modules previously produced an exception). --- diff --git a/Lib/inspect.py b/Lib/inspect.py index 80f65b53ba95..4baebe0c6f46 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -366,12 +366,12 @@ def getmodule(object): except TypeError: return None if file in modulesbyfile: - return sys.modules[modulesbyfile[file]] + return sys.modules.get(modulesbyfile[file]) for module in sys.modules.values(): if hasattr(module, '__file__'): modulesbyfile[getabsfile(module)] = module.__name__ if file in modulesbyfile: - return sys.modules[modulesbyfile[file]] + return sys.modules.get(modulesbyfile[file]) main = sys.modules['__main__'] if hasattr(main, object.__name__): mainobject = getattr(main, object.__name__)