diff options
Diffstat (limited to 'Lib/xml/dom/pulldom.py')
| -rw-r--r-- | Lib/xml/dom/pulldom.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/Lib/xml/dom/pulldom.py b/Lib/xml/dom/pulldom.py index 18f49b50196..d5ac8b2b984 100644 --- a/Lib/xml/dom/pulldom.py +++ b/Lib/xml/dom/pulldom.py @@ -2,11 +2,6 @@ import xml.sax import xml.sax.handler import types -try: - _StringTypes = [types.StringType, types.UnicodeType] -except AttributeError: - _StringTypes = [types.StringType] - START_ELEMENT = "START_ELEMENT" END_ELEMENT = "END_ELEMENT" COMMENT = "COMMENT" @@ -201,7 +196,7 @@ class PullDOM(xml.sax.ContentHandler): class ErrorHandler: def warning(self, exception): - print exception + print(exception) def error(self, exception): raise exception def fatalError(self, exception): @@ -228,7 +223,7 @@ class DOMEventStream: return rc raise IndexError - def next(self): + def __next__(self): rc = self.getEvent() if rc: return rc @@ -330,8 +325,8 @@ default_bufsize = (2 ** 14) - 20 def parse(stream_or_string, parser=None, bufsize=None): if bufsize is None: bufsize = default_bufsize - if type(stream_or_string) in _StringTypes: - stream = open(stream_or_string) + if isinstance(stream_or_string, str): + stream = open(stream_or_string, 'rb') else: stream = stream_or_string if not parser: @@ -340,9 +335,9 @@ def parse(stream_or_string, parser=None, bufsize=None): def parseString(string, parser=None): try: - from cStringIO import StringIO + from io import StringIO except ImportError: - from StringIO import StringIO + from io import StringIO bufsize = len(string) buf = StringIO(string) |