Update of /cvsroot/happydoc/HappyDoc/happydoclib/parseinfo
In directory usw-pr-cvs1:/tmp/cvs-serv10733/happydoclib/parseinfo
Modified Files:
Tag: dos_path_bug
__init__.py suite.py
Log Message:
Initial pass at a fix for the Win32 path problems, including simplifying the definition of the path to the output file for an objects documentation.
Index: __init__.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc/happydoclib/parseinfo/__init__.py,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** __init__.py 5 Feb 2002 01:18:21 -0000 1.6
--- __init__.py 13 May 2002 01:14:44 -0000 1.6.2.1
***************
*** 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.
***************
*** 139,142 ****
--- 139,148 ----
"""
+ happydoclib.TRACE.into('parseinfo', 'getDocs',
+ parent=parent,
+ fileName=fileName,
+ includeComments=includeComments,
+ defaultConfigValues=defaultConfigValues,
+ )
f = open(fileName)
#
***************
*** 172,176 ****
else:
comment_info = {}
! mod_info = ModuleInfo(parent=None,
tree=tup,
name=base_filename,
--- 178,182 ----
else:
comment_info = {}
! mod_info = ModuleInfo(parent=parent,
tree=tup,
name=base_filename,
***************
*** 178,181 ****
--- 184,188 ----
commentInfo=comment_info,
defaultConfigValues=defaultConfigValues)
+ happydoclib.TRACE.outof(mod_info)
return mod_info
***************
*** 210,214 ****
comments_flag = self.include_comments.get(name, 1)
self.filename = filename
! self.parsed_module = getDocs(filename, includeComments=comments_flag)
return
--- 217,221 ----
comments_flag = self.include_comments.get(name, 1)
self.filename = filename
! self.parsed_module = getDocs(None, filename, includeComments=comments_flag)
return
Index: suite.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc/happydoclib/parseinfo/suite.py,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -d -r1.1 -r1.1.2.1
*** suite.py 11 Nov 2001 18:51:37 -0000 1.1
--- suite.py 13 May 2002 01:14:44 -0000 1.1.2.1
***************
*** 131,138 ****
def getConfigurationValues(self):
"Return any HappyDoc configuration values related to this object."
if self._parent:
! return self._parent.getConfigurationValues()
! else:
! return self._configuration_values
def _extractInfo(self, tree):
--- 131,143 ----
def getConfigurationValues(self):
"Return any HappyDoc configuration values related to this object."
+ values = None
if self._parent:
! try:
! values = self._parent.getConfigurationValues()
! except:
! values = None
! if values is None:
! values = self._configuration_values
! return values
def _extractInfo(self, tree):
|
