Update of /cvsroot/happydoc/HappyDoc3/happydoclib
In directory sc8-pr-cvs1:/tmp/cvs-serv25928/happydoclib
Modified Files:
scanner.py
Log Message:
Fixup trace statements so that it is easier to debug the find function.
Index: scanner.py
===================================================================
RCS file: /cvsroot/happydoc/HappyDoc3/happydoclib/scanner.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** scanner.py 27 Dec 2002 18:33:53 -0000 1.9
--- scanner.py 28 Dec 2002 14:26:29 -0000 1.10
***************
*** 410,415 ****
--- 410,417 ----
value is None.
"""
+ trace_level=1
trace.into('PackageTree', 'findNodeFromDottedName',
dottedNodeName=dottedNodeName,
+ outputLevel=trace_level,
)
***************
*** 418,423 ****
--- 420,432 ----
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,
)
***************
*** 429,441 ****
if (named_node is None):
if (name == self.getName()):
! trace.write('Matched ourself')
named_node = self
if (named_node is None):
! trace.write('Checking child')
named_node = self.get(name)
if (named_node is None):
! trace.write('Checking child.py')
named_node = self.get('%s.py' % name)
--- 438,456 ----
if (named_node is None):
if (name == self.getName()):
! trace.write('Matched ourself',
! outputLevel=trace_level,
! )
named_node = self
if (named_node is None):
! trace.write('Checking %s as child' % name,
! outputLevel=trace_level,
! )
named_node = self.get(name)
if (named_node is None):
! trace.write('Checking %s.py as child' % name,
! outputLevel=trace_level,
! )
named_node = self.get('%s.py' % name)
***************
*** 446,450 ****
parent = self.getParent()
if parent:
! trace.write('Checking parent')
named_node = parent.findNodeFromDottedName(dottedNodeName)
--- 461,467 ----
parent = self.getParent()
if parent:
! trace.write('Checking for %s in parent' % name,
! outputLevel=trace_level,
! )
named_node = parent.findNodeFromDottedName(dottedNodeName)
***************
*** 453,461 ****
#
if named_node and remainder:
! trace.write('Recursing')
named_node = named_node.findNodeFromDottedName(remainder,
tryParent=0)
! trace.outof(named_node)
return named_node
--- 470,485 ----
#
if named_node and remainder:
! trace.write('Handling remainder',
! outputLevel=trace_level,
! )
named_node = named_node.findNodeFromDottedName(remainder,
tryParent=0)
! if named_node is not None:
! trace.outof(named_node.getName(),
! outputLevel=trace_level,
! )
! else:
! trace.outof(outputLevel=trace_level)
return named_node
|
