[Happydoc-checkins] CVS: HappyDoc3/happydoclib scanner.py,1.17,1.18

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

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

Modified Files:
	scanner.py 
Log Message:
Move defaults for ignore patterns into the Scanner class.
Use the parsers module to get a new node for each file scanned,
instead of always using PackageTree directly.


Index: scanner.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/scanner.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** scanner.py	18 Jan 2003 16:52:05 -0000	1.17
--- scanner.py	18 Jan 2003 20:01:02 -0000	1.18
***************
*** 59,62 ****
--- 59,63 ----
  #
  import glob
+ import mimetypes
  import os
  import re
***************
*** 67,73 ****
  import happydoclib
  from happydoclib.packagetree import PackageTree
  from happydoclib.status import statusMessage
  from happydoclib.trace import trace
! from happydoclib.utils import *
  from happydoclib.cvsignore import CVSIgnoreList
  
--- 68,75 ----
  import happydoclib
  from happydoclib.packagetree import PackageTree
+ from happydoclib.parsers import ParserLoader
  from happydoclib.status import statusMessage
  from happydoclib.trace import trace
! from happydoclib.utils import getMimeType
  from happydoclib.cvsignore import CVSIgnoreList
  
***************
*** 85,91 ****
      """
  
      def __init__(self,
                   inputDirectories,
!                  ignorePatterns=[],
                   includeComments=1,
                   ):
--- 87,97 ----
      """
  
+     DEFAULT_IGNORE_PATTERNS = ['^(CVS|dist|build|docs?|.*pyc|.*~|tmp)$',
+                                'trace.txt',
+                                ]
+ 
      def __init__(self,
                   inputDirectories,
!                  ignorePatterns=DEFAULT_IGNORE_PATTERNS,
                   includeComments=1,
                   ):
***************
*** 102,105 ****
--- 108,113 ----
          self._package_trees = []
  
+         self.parser_loader = ParserLoader()
+ 
          #
          # Scan
***************
*** 113,121 ****
                  self._package_trees.append(tree)
  
-         #
-         # Parse
-         #
-         self.parsePackageTree()
- 
          trace.outof(outputLevel=TRACE_LEVEL)
          return
--- 121,124 ----
***************
*** 169,173 ****
          # Create the node for this name
          #
!         tree = PackageTree(parent, directoryName)
          
          #
--- 172,183 ----
          # Create the node for this name
          #
!         mimetype, encoding = getMimeType(directoryName)
!         try:
!             parser_factory = self.parser_loader[mimetype]
!         except KeyError:
!             parser_factory = self.parser_loader['application/octet-stream']
! 
!         parser = parser_factory()
!         tree = parser(parent, directoryName)
          
          #