[Happydoc-checkins] CVS: HappyDoc3/happydoclib/docset docset_MultiHTMLFile.py,1.6,1.7

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

Update of /cvsroot/happydoc/HappyDoc3/happydoclib/docset
In directory sc8-pr-cvs1:/tmp/cvs-serv10610/happydoclib/docset

Modified Files:
	docset_MultiHTMLFile.py 
Log Message:
Add optional argument includePath to
getOutputFilenameForPackageTreeNode() so we can get just the basename
of the output file.
Remove dead code.


Index: docset_MultiHTMLFile.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_MultiHTMLFile.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** docset_MultiHTMLFile.py	8 Dec 2002 16:27:33 -0000	1.6
--- docset_MultiHTMLFile.py	8 Dec 2002 17:02:58 -0000	1.7
***************
*** 86,94 ****
      codeForegroundColor='#000088'
      
!     def getOutputFilenameForPackageTreeNode(self, packageTreeNode):
          trace.into('MultiHTMLFileDocSet', 'getOutputFilenameForPackageTreeNode')
          filename = base.MultiFileDocSet.getOutputFilenameForPackageTreeNode(
              self,
              packageTreeNode,
              )
          
--- 86,95 ----
      codeForegroundColor='#000088'
      
!     def getOutputFilenameForPackageTreeNode(self, packageTreeNode, includePath=1):
          trace.into('MultiHTMLFileDocSet', 'getOutputFilenameForPackageTreeNode')
          filename = base.MultiFileDocSet.getOutputFilenameForPackageTreeNode(
              self,
              packageTreeNode,
+             includePath=includePath,
              )
          
***************
*** 169,195 ****
          ''' % locals())
          return
- 
-     def _getReadmeTextForDirectory(self, packageTreeNode):
-         """Returns the raw README text for the directory.
- 
-         Returns first value found, in order:
- 
-           1. __init__.py docstring
- 
-           2. README.txt
- 
-           3. README.stx
-           
-         """
-         trace.into('MultiHTMLFile', '_getReadmeTextForDirectory',
-                    packageTreeNode=packageTreeNode,
-                    )
-         
-         readme_text = ''
-         text_format = 'StructuredText'
- 
-                 
-         trace.outof( (readme_text, text_format))
-         return (readme_text, text_format)
  
      def _writeDescriptiveList(self, output, descriptiveList):
--- 170,173 ----