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

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

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

Modified Files:
	docset_MultiHTMLFile.py 
Log Message:
Merge the list of external documentation in all formats into one list.
Skip the __init__.py file when listing modules in this directory.


Index: docset_MultiHTMLFile.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_MultiHTMLFile.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** docset_MultiHTMLFile.py	8 Dec 2002 16:24:33 -0000	1.5
--- docset_MultiHTMLFile.py	8 Dec 2002 16:27:33 -0000	1.6
***************
*** 269,277 ****
          plain_text_files = contained_modules_map.get('text/plain', [])
          structured_text_files = contained_modules_map.get('text/x-structured', [])
!         text_files = plain_text_files + structured_text_files
          self._writeTOCReferencesSection(
              output,
              packageTreeNode,
!             'Text files',
              text_files,
              )
--- 269,278 ----
          plain_text_files = contained_modules_map.get('text/plain', [])
          structured_text_files = contained_modules_map.get('text/x-structured', [])
!         html_files = contained_modules_map.get('text/html', [])
!         text_files = plain_text_files + structured_text_files + html_files
          self._writeTOCReferencesSection(
              output,
              packageTreeNode,
!             'Other documentation',
              text_files,
              )
***************
*** 284,288 ****
              packageTreeNode,
              'Python files',
!             contained_modules_map.get('text/x-python', []),
              )
          
--- 285,291 ----
              packageTreeNode,
              'Python files',
!             [ cm for cm in contained_modules_map.get('text/x-python', [])
!               if cm[1].getName() != '__init__.py'
!               ],
              )