Update of /cvsroot/docstring/dps/dps
In directory usw-pr-cvs1:/tmp/cvs-serv28232/dps/dps
Modified Files:
nodes.py
Log Message:
- 'errorhandler' -> 'reporter'.
- Added document.languagecode.
Index: nodes.py
===================================================================
RCS file: /cvsroot/docstring/dps/dps/nodes.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** nodes.py 2001/11/22 04:11:44 1.20
--- nodes.py 2002/01/16 02:47:59 1.21
***************
*** 341,346 ****
class document(Root, Element):
! def __init__(self, errorhandler, *args, **kwargs):
Element.__init__(self, *args, **kwargs)
self.explicittargets = {}
self.implicittargets = {}
--- 341,348 ----
class document(Root, Element):
! def __init__(self, reporter, languagecode, *args, **kwargs):
Element.__init__(self, *args, **kwargs)
+ self.reporter = reporter
+ self.languagecode = languagecode
self.explicittargets = {}
self.implicittargets = {}
***************
*** 354,358 ****
self.autofootnotes = []
self.autofootnoterefs = []
- self.errorhandler = errorhandler
def asdom(self, dom=xml.dom.minidom):
--- 356,359 ----
***************
*** 367,371 ****
or self.externaltargets.has_key(name) \
or self.implicittargets.has_key(name):
! sw = self.errorhandler.information(
'Duplicate implicit target name: "%s"' % name)
innode += sw
--- 368,372 ----
or self.externaltargets.has_key(name) \
or self.implicittargets.has_key(name):
! sw = self.reporter.information(
'Duplicate implicit target name: "%s"' % name)
innode += sw
***************
*** 381,385 ****
innode = targetnode
if self.explicittargets.has_key(name):
! sw = self.errorhandler.warning(
'Duplicate explicit target name: "%s"' % name)
innode += sw
--- 382,386 ----
innode = targetnode
if self.explicittargets.has_key(name):
! sw = self.reporter.warning(
'Duplicate explicit target name: "%s"' % name)
innode += sw
***************
*** 390,394 ****
return
elif self.implicittargets.has_key(name):
! sw = self.errorhandler.information(
'Duplicate implicit target name: "%s"' % name)
innode += sw
--- 391,395 ----
return
elif self.implicittargets.has_key(name):
! sw = self.reporter.information(
'Duplicate implicit target name: "%s"' % name)
innode += sw
***************
*** 414,418 ****
level = 1
break
! sw = self.errorhandler.system_warning(
level, 'Duplicate external target name: "%s"' % name)
innode += sw
--- 415,419 ----
level = 1
break
! sw = self.reporter.system_warning(
level, 'Duplicate external target name: "%s"' % name)
innode += sw
***************
*** 420,424 ****
self.externaltargets, self.implicittargets)
elif self.implicittargets.has_key(name):
! sw = self.errorhandler.information(
'Duplicate implicit target name: "%s"' % name)
innode += sw
--- 421,425 ----
self.externaltargets, self.implicittargets)
elif self.implicittargets.has_key(name):
! sw = self.reporter.information(
'Duplicate implicit target name: "%s"' % name)
innode += sw
***************
*** 451,455 ****
def addsubstitutiondef(self, name, substitutiondefnode, innode):
if self.substitutiondefs.has_key(name):
! sw = self.errorhandler.error(
'Duplicate substitution definition name: "%s"' % name)
innode += sw
--- 452,456 ----
def addsubstitutiondef(self, name, substitutiondefnode, innode):
if self.substitutiondefs.has_key(name):
! sw = self.reporter.error(
'Duplicate substitution definition name: "%s"' % name)
innode += sw
|
