Update of /cvsroot/happydoc/HappyDoc/happydoclib
In directory usw-pr-cvs1:/tmp/cvs-serv10201/happydoclib
Modified Files:
happydocset.py
Log Message:
Allow files ending .cgi to be documented.
When testing, pass status message function down so that output can be shown.
Index: happydocset.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc/happydoclib/happydocset.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** happydocset.py 2001/12/09 15:36:01 1.6
--- happydocset.py 2002/02/02 13:53:02 1.7
***************
*** 613,617 ****
def processFiles(self,
fileNames,
! moduleFileName=re.compile(r'^.*\.py$').match,
):
"""Get information about a list of files.
--- 613,617 ----
def processFiles(self,
fileNames,
! moduleFileName=re.compile(r'^.*\.(py|cgi)$').match,
):
"""Get information about a list of files.
***************
*** 688,692 ****
self.processFiles(dir_contents)
! elif moduleFileName(file_name):
#
# Record that we paid attention to this file
--- 688,695 ----
self.processFiles(dir_contents)
! elif ( not happydoclib.path.isdir(file_name)
! and
! moduleFileName(file_name)
! ):
#
# Record that we paid attention to this file
***************
*** 706,709 ****
--- 709,719 ----
else:
self.append(file_info)
+
+ else:
+ #
+ # Ignoring
+ #
+ self.statusMessage('Ignoring %s' % file_name, 4)
+
happydoclib.TRACE.outof()
return
***************
*** 847,850 ****
--- 857,861 ----
inputModuleNames=[ filename ],
outputBaseDirectory=self.output_dir,
+ statusMessageFunc=self.status_message_func,
)
for m in docset.data:
***************
*** 888,891 ****
--- 899,903 ----
outputBaseDirectory=self.output_dir,
includePrivateNames=includePrivateNames,
+ statusMessageFunc=self.status_message_func,
)
assert len(docset.data) == 1, 'Did not get expected docset.'
***************
*** 934,937 ****
--- 946,950 ----
def testIgnoreDirectories(self):
+ "Ignore some subdirectories."
filename = '../HappyDoc'
import happydoclib.formatter.formatter_Null
***************
*** 947,950 ****
--- 960,964 ----
outputBaseDirectory=self.output_dir,
ignoreDirFunc=self._testIgnoreDirectoriesTestFunc,
+ statusMessageFunc=self.status_message_func,
)
for m in docset.data:
|
