[Python-checkins] CVS: python/dist/src/Lib pyclbr.py,1.21,1.22

[Fred L. Drake]

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

Modified Files:
	pyclbr.py 
Log Message:

Nick Mathewson: Make sure the recursion is handled properly.
This is part of SF patch #440292.


Index: pyclbr.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pyclbr.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** pyclbr.py	2001/08/13 15:55:19	1.21
--- pyclbr.py	2001/08/13 20:20:51	1.22
***************
*** 167,172 ****
          package = module[:i].strip()
          submodule = module[i+1:].strip()
!         parent = readmodule(package, path, inpackage)
!         child = readmodule(submodule, parent['__path__'], 1)
          return child
  
--- 167,172 ----
          package = module[:i].strip()
          submodule = module[i+1:].strip()
!         parent = readmodule_ex(package, path, inpackage)
!         child = readmodule_ex(submodule, parent['__path__'], 1)
          return child
  
***************
*** 296,300 ****
                  try:
                      # recursively read the imported module
!                     d = readmodule(n, path, inpackage)
                  except:
                      ##print 'module', n, 'not found'
--- 296,300 ----
                  try:
                      # recursively read the imported module
!                     d = readmodule_ex(n, path, inpackage)
                  except:
                      ##print 'module', n, 'not found'
***************
*** 307,311 ****
              try:
                  # recursively read the imported module
!                 d = readmodule(mod, path, inpackage)
              except:
                  ##print 'module', mod, 'not found'
--- 307,311 ----
              try:
                  # recursively read the imported module
!                 d = readmodule_ex(mod, path, inpackage)
              except:
                  ##print 'module', mod, 'not found'