[Happydoc-checkins] CVS: HappyDoc/happydoclib happydocset.py,1.9,1.10

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

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

Modified Files:
	happydocset.py 
Log Message:
Improved fix for -d problem.


Index: happydocset.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc/happydoclib/happydocset.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** happydocset.py	4 Aug 2002 12:03:58 -0000	1.9
--- happydocset.py	24 Aug 2002 19:57:07 -0000	1.10
***************
*** 342,345 ****
--- 342,353 ----
          fully_qualified_name = formatter.getOutputNameForObject(self)
          happydoclib.TRACE.writeVar(fully_qualified_name=fully_qualified_name)
+         
+         extension = '.%s' % formatter.getFilenameExtension()
+         len_extension = len(extension)
+         if fully_qualified_name[-len_extension:] == extension:
+             happydoclib.TRACE.write('fully qualified name has extension')
+             fully_qualified_name = fully_qualified_name[:-len_extension]
+             happydoclib.TRACE.writeVar(fully_qualified_name=fully_qualified_name)
+                                 
          root_node_name = formatter.getRootNodeName()
          my_root_node = happydoclib.path.join(fully_qualified_name, root_node_name)
***************
*** 356,360 ****
          happydoclib.TRACE.into('DocSet', 'getFullOutputNameForObject',
                                 infoObject=infoObject)
!         output_name = self._formatter.getFullOutputNameForObject(infoObject)
          happydoclib.TRACE.outof(output_name)
          return output_name
--- 364,371 ----
          happydoclib.TRACE.into('DocSet', 'getFullOutputNameForObject',
                                 infoObject=infoObject)
!         if infoObject is None:
!             output_name = self._formatter.getFullOutputNameForObject(None)
!         else:
!             output_name = self._formatter.getFullOutputNameForObject(infoObject)
          happydoclib.TRACE.outof(output_name)
          return output_name
***************
*** 546,549 ****
--- 557,573 ----
  
          '''
+         current_docset_path = self.getPath()
+         happydoclib.TRACE.writeVar(current_docset_path=current_docset_path)
+ 
+         docset_base_directory_prefix = docsetBaseDirectory[:-len(packageName)]
+         while (docset_base_directory_prefix
+                and
+                (docset_base_directory_prefix[-1] == os.sep)
+                ):
+             docset_base_directory_prefix = docset_base_directory_prefix[:-1]
+         happydoclib.TRACE.writeVar(
+             docset_base_directory_prefix=docset_base_directory_prefix,
+             )
+         
          constructor_args = {
              'formatterFactory':self._formatter_factory,
***************
*** 565,568 ****
--- 589,593 ----
              'statusMessageFunc':self._status_message_func,
              'useRecursion':self._use_recursion,
+             'parent':self,
              }
          #
***************
*** 590,599 ****
                                 )
          self.statusMessage('Getting info for %s' % fileName)
!         info = self._parser_func( fileName,
!                                   self._include_comments,
!                                   self._default_parser_config_values,
!                                   )
!         happydoclib.TRACE.outof(info)
!         return info
  
      def lookForPrewrittenFiles(self, dirName):
--- 615,625 ----
                                 )
          self.statusMessage('Getting info for %s' % fileName)
!         module_info = self._parser_func( self,
!                                          fileName,
!                                          self._include_comments,
!                                          self._default_parser_config_values,
!                                       )
!         happydoclib.TRACE.outof(module_info)
!         return module_info
  
      def lookForPrewrittenFiles(self, dirName):
***************
*** 846,868 ****
      
  class DocsetUnitTest(happydoclib.StreamFlushTest.StreamFlushTest):    
!     
!     def testPackageSummaries(self):
!         filename = 'TestCases/test_package_summaries'
!         
!         basic_expected_package_info = {
!             'FromInit':'Summary from __init__.py',
!             'FromReadme':'Summary from README',
!             'FromReadmeTxt':'Summary from README.txt',
!             'FromTitle':'HappyDoc Generated Documentation (use -t to specify a new title): Nested.FromTitle',
!             }
!         basic_expected_package_names = basic_expected_package_info.keys()
!         
!         parent_expected_package_info = {}
!         parent_expected_package_info.update(basic_expected_package_info)
!         parent_expected_package_info['Nested'] = 'Nested Modules'
!         parent_expected_package_info['FromTitle'] = 'HappyDoc Generated Documentation (use -t to specify a new title): FromTitle'
!         parent_expected_package_names = parent_expected_package_info.keys()
!         
!         #module = getDocs(None, filename)
          import happydoclib.formatter.formatter_Null
          docset = DocSet( formatterFactory=happydoclib.formatter.formatter_Null.NullFormatter,
--- 872,879 ----
      
  class DocsetUnitTest(happydoclib.StreamFlushTest.StreamFlushTest):    
! 
!     def testOutputDirectory(self):
!         filename = 'TestCases/test.py'
!         test_output_dir = 'c:\\happydoc\\HappyDocTestOut'
          import happydoclib.formatter.formatter_Null
          docset = DocSet( formatterFactory=happydoclib.formatter.formatter_Null.NullFormatter,
***************
*** 870,906 ****
                           defaultParserConfigValues={'docStringFormat':'StructuredText'},
                           inputModuleNames=[ filename ],
!                          outputBaseDirectory=self.output_dir,
                           statusMessageFunc=self.status_message_func,
                           )
!         for m in docset.data:
!             name = m.getName()
!             assert name in parent_expected_package_names, \
!                    'Unexpected module %s found in docset.' % name
! 
!             expected_summary = parent_expected_package_info[name]
! 
!             actual_summary, format = m.getSummaryAndFormat()
!             assert actual_summary == expected_summary, \
!                    'Summary values do not match for %s (expected "%s", got "%s")' \
!                    % (name, expected_summary, actual_summary)
! 
!             if name == 'Nested':
!                 for cm in m.data:
!                     cname = cm.getName()
!                     if cname == '__init__':
!                         continue
!                     assert cname in basic_expected_package_names, \
!                            'Unexpected child module %s found in child docset.' % cname
! 
!                     cexpected_summary = basic_expected_package_info[cname]
  
!                     cactual_summary, format = cm.getSummaryAndFormat()
!                     assert cactual_summary == cexpected_summary, \
!                            'Summary values do not match for child module %s (expected "%s", got "%s")' \
!                            % (cname, cexpected_summary, cactual_summary)
!                     
!                 
              
!         return
  
      def _privateNameTest(self, includePrivateNames):
--- 881,952 ----
                           defaultParserConfigValues={'docStringFormat':'StructuredText'},
                           inputModuleNames=[ filename ],
!                          outputBaseDirectory=test_output_dir,
                           statusMessageFunc=self.status_message_func,
                           )
!         docset_base_dir = docset.getDocsetBaseDirectory()
!         assert docset_base_dir == test_output_dir, 'Docset directory %s does not match %s' % \
!             (docset_base_dir, test_output_dir)
!         output_base_dir = docset.getOutputBaseDirectory()
!         assert docset_base_dir == test_output_dir, 'Output directory %s does not match %s' % \
!             (docset_base_dir, test_output_dir)
!         docset_file_name = docset.getFilename()
!         assert docset_file_name == test_output_dir, 'File name %s does not match expected %s' % \
!                (docset_file_name, test_output_dir)
!         return
  
!     if os.name != 'nt':    
!         def testPackageSummaries(self):
!             filename = 'TestCases/test_package_summaries'
!         
!             basic_expected_package_info = {
!                 'FromInit':'Summary from __init__.py',
!                 'FromReadme':'Summary from README',
!                 'FromReadmeTxt':'Summary from README.txt',
!                 'FromTitle':'HappyDoc Generated Documentation (use -t to specify a new title): Nested.FromTitle',
!                 }
!             basic_expected_package_names = basic_expected_package_info.keys()
              
!             parent_expected_package_info = {}
!             parent_expected_package_info.update(basic_expected_package_info)
!             parent_expected_package_info['Nested'] = 'Nested Modules'
!             parent_expected_package_info['FromTitle'] = 'HappyDoc Generated Documentation (use -t to specify a new title): FromTitle'
!             parent_expected_package_names = parent_expected_package_info.keys()
!             
!             #module = getDocs(None, filename)
!             import happydoclib.formatter.formatter_Null
!             docset = DocSet( formatterFactory=happydoclib.formatter.formatter_Null.NullFormatter,
!                              parserFunc=happydoclib.parseinfo.getDocs,
!                              defaultParserConfigValues={'docStringFormat':'StructuredText'},
!                              inputModuleNames=[ filename ],
!                              outputBaseDirectory=self.output_dir,
!                              statusMessageFunc=self.status_message_func,
!                              )
!             for m in docset.data:
!                 name = m.getName()
!                 assert name in parent_expected_package_names, \
!                        'Unexpected module %s found in docset.' % name
!     
!                 expected_summary = parent_expected_package_info[name]
!     
!                 actual_summary, format = m.getSummaryAndFormat()
!                 assert actual_summary == expected_summary, \
!                        'Summary values do not match for %s (expected "%s", got "%s")' \
!                        % (name, expected_summary, actual_summary)
!     
!                 if name == 'Nested':
!                     for cm in m.data:
!                         cname = cm.getName()
!                         if cname == '__init__':
!                             continue
!                         assert cname in basic_expected_package_names, \
!                                'Unexpected child module %s found in child docset.' % cname
!     
!                         cexpected_summary = basic_expected_package_info[cname]
!     
!                         cactual_summary, format = cm.getSummaryAndFormat()
!                         assert cactual_summary == cexpected_summary, \
!                                'Summary values do not match for child module %s (expected "%s", got "%s")' \
!                                % (cname, cexpected_summary, cactual_summary)
!             return
  
      def _privateNameTest(self, includePrivateNames):