[Happydoc-checkins] CVS: HappyDoc3/happydoclib/docset docset_MultiHTMLFile.py,1.10,1.11

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

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

Modified Files:
	docset_MultiHTMLFile.py 
Log Message:
Use the dotted name of the module as the title of the anchor tag when
generating a link to a known module.

Check 'is not null' when examining the result of the dotted name search.


Index: docset_MultiHTMLFile.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/docset/docset_MultiHTMLFile.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** docset_MultiHTMLFile.py	27 Dec 2002 18:37:05 -0000	1.10
--- docset_MultiHTMLFile.py	28 Dec 2002 14:27:32 -0000	1.11
***************
*** 389,393 ****
          return
      
!     def _writeImportForPythonSystemModule(self, output, packageTreeNode, name, symbols, url):
          ref = '<a href="%s">%s</a>' % (url, name)
          if symbols:
--- 389,399 ----
          return
      
!     def _writeImportForPythonSystemModule(self,
!                                           output,
!                                           packageTreeNode,
!                                           name,
!                                           symbols,
!                                           url,
!                                           ):
          ref = '<a href="%s">%s</a>' % (url, name)
          if symbols:
***************
*** 405,409 ****
  
      
!     def _writeImportForKnownModule(self, output, packageTreeNode, referencedModule, symbols):
          #
          # Compute the href from here to there.
--- 411,421 ----
  
      
!     def _writeImportForKnownModule(self,
!                                    output,
!                                    packageTreeNode,
!                                    name,
!                                    referencedModule,
!                                    symbols,
!                                    ):
          #
          # Compute the href from here to there.
***************
*** 412,415 ****
--- 424,428 ----
              packageTreeNode,
              referencedModule,
+             title=name,
              )
  
***************
*** 466,477 ****
                                                             )
                      continue
!                 
                  #
                  # Check to see if the name is another module we know about.
                  #
                  referenced_module = packageTreeNode.findNodeFromDottedName(name)
!                 if referenced_module:
                      self._writeImportForKnownModule(output,
                                                      packageTreeNode,
                                                      referenced_module,
                                                      symbols,
--- 479,491 ----
                                                             )
                      continue
! 
                  #
                  # Check to see if the name is another module we know about.
                  #
                  referenced_module = packageTreeNode.findNodeFromDottedName(name)
!                 if referenced_module is not None:
                      self._writeImportForKnownModule(output,
                                                      packageTreeNode,
+                                                     name,
                                                      referenced_module,
                                                      symbols,