[Happydoc-checkins] CVS: HappyDoc/happydoclib/parseinfo __init__.py,1.7,1.8

[Doug H. <dou...@us...>]

Update of /cvsroot/happydoc/HappyDoc/happydoclib/parseinfo
In directory usw-pr-cvs1:/tmp/cvs-serv19573/happydoclib/parseinfo

Modified Files:
	__init__.py 
Log Message:
Improved fix for -d bug (#513850).


Index: __init__.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc/happydoclib/parseinfo/__init__.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** __init__.py	4 Aug 2002 12:06:26 -0000	1.7
--- __init__.py	24 Aug 2002 19:53:54 -0000	1.8
***************
*** 126,130 ****
  #
  
! def getDocs(fileName, includeComments=1, defaultConfigValues={}):
      """Retrieve information from the parse tree of a source file.
  
--- 126,130 ----
  #
  
! def getDocs(parent, fileName, includeComments=1, defaultConfigValues={}):
      """Retrieve information from the parse tree of a source file.
  
***************
*** 140,148 ****
      """
      happydoclib.TRACE.into('parseinfo', 'getDocs',
                             fileName=fileName,
                             includeComments=includeComments,
                             defaultConfigValues=defaultConfigValues,
                             )
-     
      f = open(fileName)
      #
--- 140,148 ----
      """
      happydoclib.TRACE.into('parseinfo', 'getDocs',
+                            parent=parent,
                             fileName=fileName,
                             includeComments=includeComments,
                             defaultConfigValues=defaultConfigValues,
                             )
      f = open(fileName)
      #
***************
*** 178,184 ****
      else:
          comment_info = {}
- 
      happydoclib.TRACE.write('Creating ModuleInfo')
!     mod_info = ModuleInfo(parent=None,
                            tree=tup,
                            name=base_filename,
--- 178,183 ----
      else:
          comment_info = {}
      happydoclib.TRACE.write('Creating ModuleInfo')
!     mod_info = ModuleInfo(parent=parent,
                            tree=tup,
                            name=base_filename,
***************
*** 186,191 ****
                            commentInfo=comment_info,
                            defaultConfigValues=defaultConfigValues)
! 
!     happydoclib.TRACE.outof()
      return mod_info
  
--- 185,189 ----
                            commentInfo=comment_info,
                            defaultConfigValues=defaultConfigValues)
!     happydoclib.TRACE.outof(mod_info)
      return mod_info
  
***************
*** 220,224 ****
          comments_flag = self.include_comments.get(name, 1)
          self.filename = filename
!         self.parsed_module = getDocs(filename, includeComments=comments_flag)
          return
  
--- 218,222 ----
          comments_flag = self.include_comments.get(name, 1)
          self.filename = filename
!         self.parsed_module = getDocs(None, filename, includeComments=comments_flag)
          return