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

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

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

Modified Files:
	scanner.py 
Log Message:
Trace statement changes to aid in debugging.


Index: scanner.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/scanner.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** scanner.py	28 Dec 2002 15:57:40 -0000	1.11
--- scanner.py	28 Dec 2002 16:41:16 -0000	1.12
***************
*** 350,357 ****
          and ending with this node.
          """
!         trace.into('PackageTree', 'getPath', useCanonicalName=useCanonicalName)
          
          parent = self.getParent()
!         trace.writeVar(parent=parent)
          if parent:
              parent_path = parent.getPath(useCanonicalName=useCanonicalName)
--- 350,362 ----
          and ending with this node.
          """
!         trace.into('PackageTree', 'getPath',
!                    useCanonicalName=useCanonicalName,
!                    outputLevel=2,
!                    )
          
          parent = self.getParent()
!         trace.writeVar(parent=parent,
!                        outputLevel=2,
!                        )
          if parent:
              parent_path = parent.getPath(useCanonicalName=useCanonicalName)
***************
*** 359,363 ****
              parent_path = ()
  
!         trace.writeVar(parent_path=parent_path)
  
          if useCanonicalName:
--- 364,370 ----
              parent_path = ()
  
!         trace.writeVar(parent_path=parent_path,
!                        outputLevel=2,
!                        )
  
          if useCanonicalName:
***************
*** 368,372 ****
          path = parent_path + (name,)
  
!         trace.outof(path)
          return path
  
--- 375,381 ----
          path = parent_path + (name,)
  
!         trace.outof(path,
!                     outputLevel=2,
!                     )
          return path
  
***************
*** 511,514 ****
--- 520,528 ----
                   includeComments=1,
                   ):
+         trace.into('Scanner', '__init__',
+                    inputDirectories=inputDirectories,
+                    ignorePatterns=ignorePatterns,
+                    includeComments=includeComments,
+                    )
  
          self._ignore_patterns = ignorePatterns
***************
*** 532,535 ****
--- 546,551 ----
          #
          self._parsePackageTree()
+ 
+         trace.outof()
          return
  
***************
*** 563,567 ****
          #if package_tree_name in self._ignore_names:
          for ignore_re in self._ignore_res:
!             if ignore_re.match(package_tree_name):
                  trace.outof()
                  return None
--- 579,586 ----
          #if package_tree_name in self._ignore_names:
          for ignore_re in self._ignore_res:
!             if ignore_re.search(package_tree_name):
!                 trace.write('Ignoring because "%s" matched %s' % (package_tree_name,
!                                                                   ignore_re.pattern)
!                             )
                  trace.outof()
                  return None