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

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

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

Modified Files:
	scanner.py 
Log Message:
Look at mimetype instead of filename to determine whether the node is
a text file when trying to get the docstring summary.


Index: scanner.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/scanner.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** scanner.py	28 Dec 2002 14:26:29 -0000	1.10
--- scanner.py	28 Dec 2002 15:57:40 -0000	1.11
***************
*** 288,292 ****
          # Are we a text file?
          #
!         if self.getName() in ('README.txt', 'README.stx'):
              input_filename = self.getInputFilename()
              readme_text = open(input_filename, 'rt').read()
--- 288,293 ----
          # Are we a text file?
          #
!         mimetype, encoding = self.getMimeType()
!         if mimetype in ('text/plain', 'text/x-structured'):
              input_filename = self.getInputFilename()
              readme_text = open(input_filename, 'rt').read()
***************
*** 297,305 ****
          # Look inside sub-nodes
          #
!         node = self.get('__init__.py')
!         if node is not None:
!             return node.getDocStringAndFormat()
! 
!         for name in ('README.txt', 'README.stx'):
              trace.write('looking for %s' % name)
              node = self.get(name)
--- 298,302 ----
          # Look inside sub-nodes
          #
!         for name in ('__init__.py', 'README.txt', 'README.stx'):
              trace.write('looking for %s' % name)
              node = self.get(name)
***************
*** 418,431 ****
          name_parts = dottedNodeName.split('.')
          name = name_parts[0]
-         remainder = '.'.join(name_parts[1:])
  
          trace.write('name=%s' % name,
                      outputLevel=trace_level,
                      )
-         trace.write('remainder=%s' % remainder,
-                     outputLevel=trace_level,
-                     )
          trace.writeVar(name=name,
-                        remainder=remainder,
                         outputLevel=trace_level,
                         )
--- 415,423 ----
***************
*** 469,474 ****
          # Do we need to process the remainder of the original name?
          #
!         if named_node and remainder:
!             trace.write('Handling remainder',
                          outputLevel=trace_level,
                          )
--- 461,467 ----
          # Do we need to process the remainder of the original name?
          #
!         if named_node and (len(name_parts) > 1):
!             remainder = '.'.join(name_parts[1:])
!             trace.write('Handling remainder (%s)' % remainder,
                          outputLevel=trace_level,
                          )