[Happydoc-checkins] CVS: HappyDoc3/happydoclib scanner.py,1.7,1.8

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

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

Modified Files:
	scanner.py 
Log Message:
Delay evaluation of mimetype until it is needed, and then use a pseudo
value for directories.


Index: scanner.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/scanner.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** scanner.py	8 Dec 2002 17:01:29 -0000	1.7
--- scanner.py	15 Dec 2002 16:59:52 -0000	1.8
***************
*** 70,73 ****
--- 70,74 ----
  from happydoclib.status import statusMessage
  from happydoclib.trace import trace
+ from happydoclib.utils import *
  
  #
***************
*** 106,111 ****
          trace.write('self.name=%s' % self.name)
          self.canonical_name = name
- 
-         self.mimetype = mimetypes.guess_type(name)
          
          trace.outof()
--- 107,110 ----
***************
*** 196,200 ****
                  self.getInputFilename(),
                  mimetype,
!                 ))
          else:
              #
--- 195,199 ----
                  self.getInputFilename(),
                  mimetype,
!                 ), 2)
          else:
              #
***************
*** 214,218 ****
          """Returns the mimetype setting for this node.
          """
!         return self.mimetype
  
      def getName(self):
--- 213,229 ----
          """Returns the mimetype setting for this node.
          """
!         trace.into('PackageTreeNode', 'getMimeType',
!                    name=self.name,
!                    )
! 
!         input_filename = self.getInputFilename()
!         mimetype = mimetypes.guess_type(input_filename)
! 
!         if mimetype == (None, None):
!             if isSomethingThatLooksLikeDirectory(input_filename):
!                 mimetype = ('application/x-directory', None)
!         
!         trace.outof(mimetype)
!         return mimetype
  
      def getName(self):