Commit ddb48674 authored by Fred Drake's avatar Fred Drake

Conform more closely with the Python style guide.

parent 7be31158
...@@ -22,7 +22,7 @@ import xml.sax ...@@ -22,7 +22,7 @@ import xml.sax
# --- ExpatParser # --- ExpatParser
class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ): class ExpatParser(xmlreader.IncrementalParser, xmlreader.Locator):
"SAX driver for the Pyexpat C module." "SAX driver for the Pyexpat C module."
def __init__(self, namespaceHandling=0, bufsize=2**16-20): def __init__(self, namespaceHandling=0, bufsize=2**16-20):
...@@ -34,12 +34,12 @@ class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ): ...@@ -34,12 +34,12 @@ class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ):
# XMLReader methods # XMLReader methods
def parse(self, stream_or_string ): def parse(self, stream_or_string):
"Parse an XML document from a URL." "Parse an XML document from a URL."
if type( stream_or_string ) == type( "" ): if type(stream_or_string) is type(""):
stream=open( stream_or_string ) stream = open(stream_or_string)
else: else:
stream=stream_or_string stream = stream_or_string
self.reset() self.reset()
self._cont_handler.setDocumentLocator(self) self._cont_handler.setDocumentLocator(self)
...@@ -78,7 +78,7 @@ class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ): ...@@ -78,7 +78,7 @@ class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ):
def feed(self, data): def feed(self, data):
if not self._parsing: if not self._parsing:
self._parsing=1 self._parsing = 1
self.reset() self.reset()
self._cont_handler.startDocument() self._cont_handler.startDocument()
# FIXME: error checking and endDocument() # FIXME: error checking and endDocument()
...@@ -87,7 +87,7 @@ class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ): ...@@ -87,7 +87,7 @@ class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ):
def close(self): def close(self):
if self._parsing: if self._parsing:
self._cont_handler.endDocument() self._cont_handler.endDocument()
self._parsing=0 self._parsing = 0
self._parser.Parse("", 1) self._parser.Parse("", 1)
def reset(self): def reset(self):
...@@ -135,12 +135,12 @@ class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ): ...@@ -135,12 +135,12 @@ class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ):
xmlreader.AttributesImpl(attrs, attrs)) xmlreader.AttributesImpl(attrs, attrs))
def end_element(self, name): def end_element(self, name):
self._cont_handler.endElement( name, name ) self._cont_handler.endElement(name, name)
def start_element_ns(self, name, attrs): def start_element_ns(self, name, attrs):
pair = name.split() pair = name.split()
if len(pair) == 1: if len(pair) == 1:
tup = (None, name ) tup = (None, name)
else: else:
tup = pair tup = pair
...@@ -152,7 +152,7 @@ class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ): ...@@ -152,7 +152,7 @@ class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ):
if len(pair) == 1: if len(pair) == 1:
name = (None, name, None) name = (None, name, None)
else: else:
name = pair+[None] # prefix is not implemented yet! name = pair + [None] # prefix is not implemented yet!
self._cont_handler.endElement(name, None) self._cont_handler.endElement(name, None)
...@@ -187,7 +187,7 @@ class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ): ...@@ -187,7 +187,7 @@ class ExpatParser( xmlreader.IncrementalParser, xmlreader.Locator ):
# --- # ---
def create_parser(*args, **kwargs): def create_parser(*args, **kwargs):
return apply( ExpatParser, args, kwargs ) return apply(ExpatParser, args, kwargs)
# --- # ---
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment