[Python-checkins] python/dist/src/Lib inspect.py,1.41,1.42

ping@users.sourceforge.net ping@users.sourceforge.net
Fri, 28 Mar 2003 08:29:54 -0800


Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1:/tmp/cvs-serv13580

Modified Files:
	inspect.py 
Log Message:
Make module lookup a little more robust (certain kinds of fiddling to
    sys.modules previously produced an exception).


Index: inspect.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/inspect.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** inspect.py	19 Jan 2003 13:21:20 -0000	1.41
--- inspect.py	28 Mar 2003 16:29:50 -0000	1.42
***************
*** 367,376 ****
          return None
      if file in modulesbyfile:
!         return sys.modules[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]]
      main = sys.modules['__main__']
      if hasattr(main, object.__name__):
--- 367,376 ----
          return None
      if file in modulesbyfile:
!         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.get(modulesbyfile[file])
      main = sys.modules['__main__']
      if hasattr(main, object.__name__):