[Happydoc-checkins] CVS: HappyDoc/happydoclib/docset docset_mstruct.py,1.3,1.4

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

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

Modified Files:
	docset_mstruct.py 
Log Message:
Do not call the formatter directly, use our own method to get the
output name for an object.


Index: docset_mstruct.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc/happydoclib/docset/docset_mstruct.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** docset_mstruct.py	7 Feb 2002 01:17:56 -0000	1.3
--- docset_mstruct.py	4 Aug 2002 12:05:20 -0000	1.4
***************
*** 114,118 ****
  
          # get the name of and open the docset index file
!         self._index_file_name=self._formatter.getFullOutputNameForObject(None)
          self._index_file=self.openOutput(self._index_file_name, self._title, '', INDEX_FILE)
  
--- 114,118 ----
  
          # get the name of and open the docset index file
!         self._index_file_name=self.getFullOutputNameForObject(None)
          self._index_file=self.openOutput(self._index_file_name, self._title, '', INDEX_FILE)
  
***************
*** 172,176 ****
          formatter.moduleIndex(module, self._index_file)
          
!         output_name=self._formatter.getFullOutputNameForObject(module)
          output=self.openOutput(output_name, 'Module: %s' % module_name, module.getFilename(), MODULE_FILE)
  
--- 172,176 ----
          formatter.moduleIndex(module, self._index_file)
          
!         output_name=self.getFullOutputNameForObject(module)
          output=self.openOutput(output_name, 'Module: %s' % module_name, module.getFilename(), MODULE_FILE)
  
***************
*** 204,208 ****
                  c=module.getClassInfo(class_name)
                  formatter.classIndex(c, output)
!                 class_output_name=formatter.getFullOutputNameForObject(c)
                  class_output=self.openOutput(class_output_name, 'Class: %s' % class_name, \
                      module.getFilename(), CLASS_FILE)
--- 204,208 ----
                  c=module.getClassInfo(class_name)
                  formatter.classIndex(c, output)
!                 class_output_name=self.getFullOutputNameForObject(c)
                  class_output=self.openOutput(class_output_name, 'Class: %s' % class_name, \
                      module.getFilename(), CLASS_FILE)