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 80f65b53ba95e21bfe170d1128f772d2947db38a..4baebe0c6f46fcf5c0cc6723ab14a69dcf460a1e 100644 (file)
--- 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__)