New version of xmllib from Sjoerd.
The main incompatibility is that the error reporting method is now
called as
parser.syntax_error(msg)
instead of
parser.syntax_error(lineno, msg)
This new version also has some code to deal with the <?xml?> and
<!DOCTYPE> tags at the start of an XML document.
The documentation has been updated, and a small test module has been
created.
diff --git a/Doc/lib/libxmllib.tex b/Doc/lib/libxmllib.tex
index db4d750..3cb6db5 100644
--- a/Doc/lib/libxmllib.tex
+++ b/Doc/lib/libxmllib.tex
@@ -39,6 +39,26 @@
redefined version should always call \code{XMLParser.close()}.
\end{funcdesc}
+\begin{funcdesc}{translate_references}{data}
+Translate all entity and character references in \code{data} and
+returns the translated string.
+\end{funcdesc}
+
+\begin{funcdesc}{handle_xml}{encoding\, standalone}
+This method is called when the \code{<?xml ...?>} tag is processed.
+The arguments are the values of the encoding and standalone attributes
+in the tag. Both encoding and standalone are optional. The values
+passed to \code{handle_xml} default to \code{None} and the string
+\code{'no'} respectively.
+\end{funcdesc}
+
+\begin{funcdesc}{handle_doctype}{tag\, data}
+This method is called when the \code{<!DOCTYPE...>} tag is processed.
+The arguments are the name of the root element and the uninterpreted
+contents of the tag, starting after the white space after the name of
+the root element.
+\end{funcdesc}
+
\begin{funcdesc}{handle_starttag}{tag\, method\, attributes}
This method is called to handle start tags for which a
\code{start_\var{tag}()} method has been defined. The \code{tag}
@@ -47,7 +67,7 @@
of the start tag. The \var{attributes} argument is a dictionary of
attributes, the key being the \var{name} and the value being the
\var{value} of the attribute found inside the tag's \code{<>} brackets.
-Lower case and double quotes and backslashes in the \var{value} have
+Character and entity references in the \var{value} have
been interpreted. For instance, for the tag
\code{<A HREF="http://www.cwi.nl/">}, this method would be called as
\code{handle_starttag('A', self.start_A, \{'HREF': 'http://www.cwi.nl/'\})}.
@@ -123,25 +143,27 @@
but not the delimiter itself. For example, the instruction
``\code{<?XML text?>}'' will cause this method to be called with the
arguments \code{'XML'} and \code{'text'}. The default method does
-nothing.
+nothing. Note that if a document starts with a \code <?xml ...?>}
+tag, \code{handle_xml} is called to handle it.
\end{funcdesc}
\begin{funcdesc}{handle_special}{data}
This method is called when a declaration is encountered. The
\code{data} argument is a string containing the text between the
``\code{<!}'' and ``\code{>}'' delimiters, but not the delimiters
-themselves. For example, the entity ``\code{<!DOCTYPE text>}'' will
-cause this method to be called with the argument \code{'DOCTYPE text'}. The
-default method does nothing.
+themselves. For example, the entity ``\code{<!ENTITY text>}'' will
+cause this method to be called with the argument \code{'ENTITY text'}. The
+default method does nothing. Note that \code{<!DOCTYPE ...>} is
+handled separately if it is located at the start of the document.
\end{funcdesc}
-\begin{funcdesc}{syntax_error}{lineno\, message}
+\begin{funcdesc}{syntax_error}{message}
This method is called when a syntax error is encountered. The
-\code{lineno} argument is the line number of the error, and the
\code{message} is a description of what was wrong. The default method
raises a \code{RuntimeError} exception. If this method is overridden,
it is permissable for it to return. This method is only called when
-the error can be recovered from.
+the error can be recovered from. Unrecoverable errors raise a
+\code{RuntimeError} without first calling \code{syntax_error}.
\end{funcdesc}
\begin{funcdesc}{unknown_starttag}{tag\, attributes}
@@ -169,17 +191,31 @@
\end{funcdesc}
Apart from overriding or extending the methods listed above, derived
-classes may also define methods of the following form to define
-processing of specific tags. Tag names in the input stream are case
-dependent; the \var{tag} occurring in method names must be in the
+classes may also define methods and variables of the following form to
+define processing of specific tags. Tag names in the input stream are
+case dependent; the \var{tag} occurring in method names must be in the
correct case:
\begin{funcdesc}{start_\var{tag}}{attributes}
This method is called to process an opening tag \var{tag}. The
\var{attributes} argument has the same meaning as described for
-\code{handle_starttag()} above.
+\code{handle_starttag()} above. In fact, the base implementation of
+\code{handle_starttag} calls this method.
\end{funcdesc}
\begin{funcdesc}{end_\var{tag}}{}
This method is called to process a closing tag \var{tag}.
\end{funcdesc}
+
+\begin{datadesc}{\var{tag}_attributes}
+If a class or instance variable \code{\var{tag}_attributes} exists, it
+should be a list or a dictionary. If a list, the elements of the list
+are the valid attributes for the element \var{tag}; if a dictionary,
+the keys are the valid attributes for the element \var{tag}, and the
+values the default values of the attributes, or \code{None} if there
+is no default.
+In addition to the attributes that were present in the tag, the
+attribute dictionary that is passed to \code{handle_starttag} and
+\code{unknown_starttag} contains values for all attributes that have a
+default value.
+\end{datadesc}
diff --git a/Doc/libxmllib.tex b/Doc/libxmllib.tex
index db4d750..3cb6db5 100644
--- a/Doc/libxmllib.tex
+++ b/Doc/libxmllib.tex
@@ -39,6 +39,26 @@
redefined version should always call \code{XMLParser.close()}.
\end{funcdesc}
+\begin{funcdesc}{translate_references}{data}
+Translate all entity and character references in \code{data} and
+returns the translated string.
+\end{funcdesc}
+
+\begin{funcdesc}{handle_xml}{encoding\, standalone}
+This method is called when the \code{<?xml ...?>} tag is processed.
+The arguments are the values of the encoding and standalone attributes
+in the tag. Both encoding and standalone are optional. The values
+passed to \code{handle_xml} default to \code{None} and the string
+\code{'no'} respectively.
+\end{funcdesc}
+
+\begin{funcdesc}{handle_doctype}{tag\, data}
+This method is called when the \code{<!DOCTYPE...>} tag is processed.
+The arguments are the name of the root element and the uninterpreted
+contents of the tag, starting after the white space after the name of
+the root element.
+\end{funcdesc}
+
\begin{funcdesc}{handle_starttag}{tag\, method\, attributes}
This method is called to handle start tags for which a
\code{start_\var{tag}()} method has been defined. The \code{tag}
@@ -47,7 +67,7 @@
of the start tag. The \var{attributes} argument is a dictionary of
attributes, the key being the \var{name} and the value being the
\var{value} of the attribute found inside the tag's \code{<>} brackets.
-Lower case and double quotes and backslashes in the \var{value} have
+Character and entity references in the \var{value} have
been interpreted. For instance, for the tag
\code{<A HREF="http://www.cwi.nl/">}, this method would be called as
\code{handle_starttag('A', self.start_A, \{'HREF': 'http://www.cwi.nl/'\})}.
@@ -123,25 +143,27 @@
but not the delimiter itself. For example, the instruction
``\code{<?XML text?>}'' will cause this method to be called with the
arguments \code{'XML'} and \code{'text'}. The default method does
-nothing.
+nothing. Note that if a document starts with a \code <?xml ...?>}
+tag, \code{handle_xml} is called to handle it.
\end{funcdesc}
\begin{funcdesc}{handle_special}{data}
This method is called when a declaration is encountered. The
\code{data} argument is a string containing the text between the
``\code{<!}'' and ``\code{>}'' delimiters, but not the delimiters
-themselves. For example, the entity ``\code{<!DOCTYPE text>}'' will
-cause this method to be called with the argument \code{'DOCTYPE text'}. The
-default method does nothing.
+themselves. For example, the entity ``\code{<!ENTITY text>}'' will
+cause this method to be called with the argument \code{'ENTITY text'}. The
+default method does nothing. Note that \code{<!DOCTYPE ...>} is
+handled separately if it is located at the start of the document.
\end{funcdesc}
-\begin{funcdesc}{syntax_error}{lineno\, message}
+\begin{funcdesc}{syntax_error}{message}
This method is called when a syntax error is encountered. The
-\code{lineno} argument is the line number of the error, and the
\code{message} is a description of what was wrong. The default method
raises a \code{RuntimeError} exception. If this method is overridden,
it is permissable for it to return. This method is only called when
-the error can be recovered from.
+the error can be recovered from. Unrecoverable errors raise a
+\code{RuntimeError} without first calling \code{syntax_error}.
\end{funcdesc}
\begin{funcdesc}{unknown_starttag}{tag\, attributes}
@@ -169,17 +191,31 @@
\end{funcdesc}
Apart from overriding or extending the methods listed above, derived
-classes may also define methods of the following form to define
-processing of specific tags. Tag names in the input stream are case
-dependent; the \var{tag} occurring in method names must be in the
+classes may also define methods and variables of the following form to
+define processing of specific tags. Tag names in the input stream are
+case dependent; the \var{tag} occurring in method names must be in the
correct case:
\begin{funcdesc}{start_\var{tag}}{attributes}
This method is called to process an opening tag \var{tag}. The
\var{attributes} argument has the same meaning as described for
-\code{handle_starttag()} above.
+\code{handle_starttag()} above. In fact, the base implementation of
+\code{handle_starttag} calls this method.
\end{funcdesc}
\begin{funcdesc}{end_\var{tag}}{}
This method is called to process a closing tag \var{tag}.
\end{funcdesc}
+
+\begin{datadesc}{\var{tag}_attributes}
+If a class or instance variable \code{\var{tag}_attributes} exists, it
+should be a list or a dictionary. If a list, the elements of the list
+are the valid attributes for the element \var{tag}; if a dictionary,
+the keys are the valid attributes for the element \var{tag}, and the
+values the default values of the attributes, or \code{None} if there
+is no default.
+In addition to the attributes that were present in the tag, the
+attribute dictionary that is passed to \code{handle_starttag} and
+\code{unknown_starttag} contains values for all attributes that have a
+default value.
+\end{datadesc}
diff --git a/Lib/test/test_xmllib.py b/Lib/test/test_xmllib.py
new file mode 100644
index 0000000..eb868a3
--- /dev/null
+++ b/Lib/test/test_xmllib.py
@@ -0,0 +1,25 @@
+'''Test module to thest the xmllib module.
+ Sjoerd Mullender
+'''
+
+from test_support import verbose
+
+testdoc = """\
+<?xml version="1.0" encoding="UTF-8" standalone='yes' ?>
+<!-- comments aren't allowed before the <?xml?> tag,
+ but they are allowed before the <!DOCTYPE> tag -->
+<!DOCTYPE greeting [
+ <!ELEMENT greeting (#PCDATA)>
+]>
+<greeting>Hello, world!</greeting>
+"""
+
+import xmllib
+if verbose:
+ parser = xmllib.TestXMLParser()
+else:
+ parser = xmllib.XMLParser()
+
+for c in testdoc:
+ parser.feed(c)
+parser.close()
diff --git a/Lib/xmllib.py b/Lib/xmllib.py
index 7b2a76a..9f6e23e 100644
--- a/Lib/xmllib.py
+++ b/Lib/xmllib.py
@@ -15,7 +15,7 @@
'<([a-zA-Z_:][^<>]*|'
'/([a-zA-Z_:][^<>]*)?|'
'![^<>]*|'
- '\?[^<>]*)?')
+ r'\?[^<>]*)?')
ref = re.compile('&(' + _Name + '|#[0-9]+|#x[0-9a-fA-F]+);?')
entityref = re.compile('&(?P<name>' + _Name + ')[^-a-zA-Z0-9._:]')
@@ -28,11 +28,12 @@
starttagend = re.compile(_opS + '(?P<slash>/?)>')
endbracket = re.compile('>')
tagfind = re.compile(_Name)
-cdataopen = re.compile('<!\[CDATA\[')
-cdataclose = re.compile('\]\]>')
+cdataopen = re.compile(r'<!\[CDATA\[')
+cdataclose = re.compile(r'\]\]>')
+doctype = re.compile('<!DOCTYPE' + _S + '(?P<name>' + _Name + ')' + _S)
special = re.compile('<!(?P<special>[^<>]*)>')
-procopen = re.compile('<\?(?P<proc>' + _Name + ')' + _S)
-procclose = re.compile('\?>')
+procopen = re.compile(r'<\?(?P<proc>' + _Name + ')' + _S)
+procclose = re.compile(_opS + r'\?>')
commentopen = re.compile('<!--')
commentclose = re.compile('-->')
doubledash = re.compile('--')
@@ -63,10 +64,12 @@
def reset(self):
self.rawdata = ''
self.stack = []
- self.lasttag = '???'
self.nomoretags = 0
self.literal = 0
self.lineno = 1
+ self.__at_start = 1
+ self.__seen_doctype = None
+ self.__seen_starttag = 0
# For derived classes only -- enter literal mode (CDATA) till EOF
def setnomoretags(self):
@@ -98,8 +101,7 @@
newdata.append(data[i:])
return string.join(newdata, '')
if data[res.end(0) - 1] != ';':
- self.syntax_error(self.lineno,
- '; missing after entity/char reference')
+ self.syntax_error("`;' missing after entity/char reference")
newdata.append(data[i:res.start(0)])
str = res.group(1)
if str[0] == '#':
@@ -123,6 +125,8 @@
i = 0
n = len(rawdata)
while i < n:
+ if i > 0:
+ self.__at_start = 0
if self.nomoretags:
data = rawdata[i:n]
self.handle_data(data)
@@ -135,6 +139,7 @@
else:
j = n
if i < j:
+ self.__at_start = 0
data = rawdata[i:j]
self.handle_data(data)
self.lineno = self.lineno + string.count(data, '\n')
@@ -150,6 +155,7 @@
continue
k = self.parse_starttag(i)
if k < 0: break
+ self.__seen_starttag = 1
self.lineno = self.lineno + string.count(rawdata[i:k], '\n')
i = k
continue
@@ -180,11 +186,29 @@
continue
res = procopen.match(rawdata, i)
if res:
- k = self.parse_proc(i, res)
+ k = self.parse_proc(i)
if k < 0: break
self.lineno = self.lineno + string.count(rawdata[i:k], '\n')
i = k
continue
+ res = doctype.match(rawdata, i)
+ if res:
+ if self.literal:
+ data = rawdata[i]
+ self.handle_data(data)
+ self.lineno = self.lineno + string.count(data, '\n')
+ i = i+1
+ continue
+ if self.__seen_doctype:
+ self.syntax_error('multiple DOCTYPE elements')
+ if self.__seen_starttag:
+ self.syntax_error('DOCTYPE not at beginning of document')
+ k = self.parse_doctype(res)
+ if k < 0: break
+ self.__seen_doctype = res.group('name')
+ self.lineno = self.lineno + string.count(rawdata[i:k], '\n')
+ i = k
+ continue
res = special.match(rawdata, i)
if res:
if self.literal:
@@ -202,7 +226,7 @@
if res is not None:
i = res.end(0)
if rawdata[i-1] != ';':
- self.syntax_error(self.lineno, '; missing in charref')
+ self.syntax_error("`;' missing in charref")
i = i-1
self.handle_charref(res.group('char')[:-1])
self.lineno = self.lineno + string.count(res.group(0), '\n')
@@ -211,7 +235,7 @@
if res is not None:
i = res.end(0)
if rawdata[i-1] != ';':
- self.syntax_error(self.lineno, '; missing in entityref')
+ self.syntax_error("`;' missing in entityref")
i = i-1
self.handle_entityref(res.group('name'))
self.lineno = self.lineno + string.count(res.group(0), '\n')
@@ -230,7 +254,7 @@
j = res.end(0)
if j == n:
break # Really incomplete
- self.syntax_error(self.lineno, 'bogus < or &')
+ self.syntax_error("bogus `<' or `&'")
data = res.group(0)
self.handle_data(data)
self.lineno = self.lineno + string.count(data, '\n')
@@ -242,7 +266,11 @@
self.lineno = self.lineno + string.count(data, '\n')
i = n
self.rawdata = rawdata[i:]
- # XXX if end: check for empty stack
+ if end:
+ if self.stack:
+ self.syntax_error('missing end tags')
+ while self.stack:
+ self.finish_endtag(self.stack[-1])
# Internal -- parse comment, return length or -1 if not terminated
def parse_comment(self, i):
@@ -254,11 +282,30 @@
return -1
# doubledash search will succeed because it's a subset of commentclose
if doubledash.search(rawdata, i+4).start(0) < res.start(0):
- self.syntax_error(self.lineno, "`--' inside comment")
+ self.syntax_error("`--' inside comment")
self.handle_comment(rawdata[i+4: res.start(0)])
return res.end(0)
- # Internal -- handle CDATA tag, return lenth or -1 if not terminated
+ # Internal -- handle DOCTYPE tag, return length or -1 if not terminated
+ def parse_doctype(self, res):
+ rawdata = self.rawdata
+ n = len(rawdata)
+ name = res.group('name')
+ j = k = res.end(0)
+ level = 0
+ while k < n:
+ c = rawdata[k]
+ if c == '<':
+ level = level + 1
+ elif c == '>':
+ if level == 0:
+ self.handle_doctype(name, rawdata[j:k])
+ return k+1
+ level = level - 1
+ k = k+1
+ return -1
+
+ # Internal -- handle CDATA tag, return length or -1 if not terminated
def parse_cdata(self, i):
rawdata = self.rawdata
if rawdata[i:i+9] <> '<![CDATA[':
@@ -269,16 +316,73 @@
self.handle_cdata(rawdata[i+9:res.start(0)])
return res.end(0)
- def parse_proc(self, i, res):
+ __xml_attributes = {'version': '1.0', 'standalone': 'no', 'encoding': None}
+ # Internal -- handle a processing instruction tag
+ def parse_proc(self, i):
rawdata = self.rawdata
+ end = procclose.search(rawdata, i)
+ if not end:
+ return -1
+ j = end.start(0)
+ res = tagfind.match(rawdata, i+2)
if not res:
raise RuntimeError, 'unexpected call to parse_proc'
- name = res.group('proc')
- res = procclose.search(rawdata, res.end(0))
- if not res:
- return -1
- self.handle_proc(name, rawdata[res.pos:res.start(0)])
- return res.end(0)
+ k = res.end(0)
+ name = res.group(0)
+ if name == 'xml':
+ if self.__at_start:
+ attrdict, k = self.parse_attributes('xml', k, j,
+ self.__xml_attributes)
+ if k != j:
+ self.syntax_error('garbage at end of <?xml?>')
+ if attrdict['version'] != '1.0':
+ self.syntax_error('only XML version 1.0 supported')
+ self.handle_xml(attrdict.get('encoding', None),
+ attrdict['standalone'])
+ return end.end(0)
+ else:
+ self.syntax_error("<?xml?> tag not at start of document")
+ self.handle_proc(name, rawdata[k:j])
+ return end.end(0)
+
+ # Internal -- parse attributes between i and j
+ def parse_attributes(self, tag, k, j, attributes = None):
+ rawdata = self.rawdata
+ # Now parse the data between k and j into a tag and attrs
+ attrdict = {}
+ try:
+ # convert attributes list to dictionary
+ d = {}
+ for a in attributes:
+ d[a] = None
+ attributes = d
+ except TypeError:
+ pass
+ while k < j:
+ res = attrfind.match(rawdata, k)
+ if not res: break
+ attrname, attrvalue = res.group('name', 'value')
+ if attrvalue is None:
+ self.syntax_error('no attribute value specified')
+ attrvalue = attrname
+ elif attrvalue[:1] == "'" == attrvalue[-1:] or \
+ attrvalue[:1] == '"' == attrvalue[-1:]:
+ attrvalue = attrvalue[1:-1]
+ else:
+ self.syntax_error('attribute value not quoted')
+ if attributes is not None and not attributes.has_key(attrname):
+ self.syntax_error('unknown attribute %s of element %s' %
+ (attrname, tag))
+ if attrdict.has_key(attrname):
+ self.syntax_error('attribute specified twice')
+ attrdict[attrname] = self.translate_references(attrvalue)
+ k = res.end(0)
+ if attributes is not None:
+ # fill in with default attributes
+ for key, val in attributes.items():
+ if val is not None and not attrdict.has_key(key):
+ attrdict[key] = val
+ return attrdict, k
# Internal -- handle starttag, return length or -1 if not terminated
def parse_starttag(self, i):
@@ -288,41 +392,22 @@
if not end:
return -1
j = end.start(0)
- # Now parse the data between i+1 and j into a tag and attrs
- attrdict = {}
res = tagfind.match(rawdata, i+1)
if not res:
raise RuntimeError, 'unexpected call to parse_starttag'
k = res.end(0)
tag = res.group(0)
+ if not self.__seen_starttag and self.__seen_doctype:
+ if tag != self.__seen_doctype:
+ self.syntax_error('starttag does not match DOCTYPE')
if hasattr(self, tag + '_attributes'):
- attrlist = getattr(self, tag + '_attributes')
+ attributes = getattr(self, tag + '_attributes')
else:
- attrlist = None
- self.lasttag = tag
- while k < j:
- res = attrfind.match(rawdata, k)
- if not res: break
- attrname, attrvalue = res.group('name', 'value')
- if attrvalue is None:
- self.syntax_error(self.lineno, 'no attribute value specified')
- attrvalue = attrname
- elif attrvalue[:1] == "'" == attrvalue[-1:] or \
- attrvalue[:1] == '"' == attrvalue[-1:]:
- attrvalue = attrvalue[1:-1]
- else:
- self.syntax_error(self.lineno, 'attribute value not quoted')
- if attrlist is not None and attrname not in attrlist:
- self.syntax_error(self.lineno,
- 'unknown attribute %s of element %s' %
- (attrname, tag))
- if attrdict.has_key(attrname):
- self.syntax_error(self.lineno, 'attribute specified twice')
- attrdict[attrname] = self.translate_references(attrvalue)
- k = res.end(0)
+ attributes = None
+ attrdict, k = self.parse_attributes(tag, k, j, attributes)
res = starttagend.match(rawdata, k)
if not res:
- self.syntax_error(self.lineno, 'garbage in start tag')
+ self.syntax_error('garbage in start tag')
self.finish_starttag(tag, attrdict)
if res and res.group('slash') == '/':
self.finish_endtag(tag)
@@ -336,7 +421,7 @@
return -1
res = tagfind.match(rawdata, i+2)
if not res:
- self.syntax_error(self.lineno, 'no name specified in end tag')
+ self.syntax_error('no name specified in end tag')
tag = ''
k = i+2
else:
@@ -346,7 +431,7 @@
# check that there is only white space at end of tag
res = space.match(rawdata, k)
if res is None or res.end(0) != end.start(0):
- self.syntax_error(self.lineno, 'garbage in end tag')
+ self.syntax_error('garbage in end tag')
self.finish_endtag(tag)
return end.end(0)
@@ -366,12 +451,14 @@
# Internal -- finish processing of end tag
def finish_endtag(self, tag):
if not tag:
+ self.syntax_error('name-less end tag')
found = len(self.stack) - 1
if found < 0:
self.unknown_endtag(tag)
return
else:
if tag not in self.stack:
+ self.syntax_error('unopened end tag')
try:
method = getattr(self, 'end_' + tag)
except AttributeError:
@@ -379,8 +466,11 @@
return
found = len(self.stack)
for i in range(found):
- if self.stack[i] == tag: found = i
+ if self.stack[i] == tag:
+ found = i
while len(self.stack) > found:
+ if found < len(self.stack) - 1:
+ self.syntax_error('missing close tag for %s' % self.stack[-1])
tag = self.stack[-1]
try:
method = getattr(self, 'end_' + tag)
@@ -392,6 +482,14 @@
self.unknown_endtag(tag)
del self.stack[-1]
+ # Overridable -- handle xml processing instruction
+ def handle_xml(self, encoding, standalone):
+ pass
+
+ # Overridable -- handle DOCTYPE
+ def handle_doctype(self, tag, data):
+ pass
+
# Overridable -- handle start tag
def handle_starttag(self, tag, method, attrs):
method(attrs)
@@ -416,8 +514,7 @@
self.handle_data(chr(n))
# Definition of entities -- derived classes may override
- entitydefs = \
- {'lt': '<', 'gt': '>', 'amp': '&', 'quot': '"', 'apos': '\''}
+ entitydefs = {'lt': '<', 'gt': '>', 'amp': '&', 'quot': '"', 'apos': "'"}
# Example -- handle entity reference, no need to override
def handle_entityref(self, name):
@@ -449,8 +546,8 @@
pass
# Example -- handle relatively harmless syntax errors, could be overridden
- def syntax_error(self, lineno, message):
- raise RuntimeError, 'Syntax error at line %d: %s' % (lineno, message)
+ def syntax_error(self, message):
+ raise RuntimeError, 'Syntax error at line %d: %s' % (self.lineno, message)
# To be overridden -- handlers for unknown objects
def unknown_starttag(self, tag, attrs): pass
@@ -465,6 +562,14 @@
self.testdata = ""
XMLParser.__init__(self, verbose)
+ def handle_xml(self, encoding, standalone):
+ self.flush()
+ print 'xml: encoding =',encoding,'standalone =',standalone
+
+ def handle_doctype(self, tag, data):
+ self.flush()
+ print 'DOCTYPE:',tag, `data`
+
def handle_data(self, data):
self.testdata = self.testdata + data
if len(`self.testdata`) >= 70:
@@ -495,8 +600,8 @@
r = r[:32] + '...' + r[-32:]
print 'comment:', r
- def syntax_error(self, lineno, message):
- print 'error at line %d:' % lineno, message
+ def syntax_error(self, message):
+ print 'error at line %d:' % self.lineno, message
def unknown_starttag(self, tag, attrs):
self.flush()
@@ -504,7 +609,7 @@
print 'start tag: <' + tag + '>'
else:
print 'start tag: <' + tag,
- for name, value in attrs:
+ for name, value in attrs.items():
print name + '=' + '"' + value + '"',
print '>'