[Python-checkins] python/dist/src/Lib modulefinder.py,1.5,1.6

[jvr@users.sourceforge.net]

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

Modified Files:
	modulefinder.py 
Log Message:
Patch #698082 from Thomas Heller:  Modulefinder didn't exclude modules
in packages correctly.


Index: modulefinder.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/modulefinder.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** modulefinder.py	27 Feb 2003 20:14:35 -0000	1.5
--- modulefinder.py	5 Mar 2003 17:23:48 -0000	1.6
***************
*** 243,247 ****
          try:
              fp, pathname, stuff = self.find_module(partname,
!                                                    parent and parent.__path__)
          except ImportError:
              self.msgout(3, "import_module ->", None)
--- 243,247 ----
          try:
              fp, pathname, stuff = self.find_module(partname,
!                                                    parent and parent.__path__, parent)
          except ImportError:
              self.msgout(3, "import_module ->", None)
***************
*** 386,392 ****
          return m
  
!     def find_module(self, name, path):
!         if path:
!             fullname = '.'.join(path)+'.'+name
          else:
              fullname = name
--- 386,392 ----
          return m
  
!     def find_module(self, name, path, parent=None):
!         if parent is not None:
!             fullname = parent.__name__+'.'+name
          else:
              fullname = name