From 011ea47577eca09abe0d78aece95618e66554f66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Thu, 28 Dec 2000 18:43:02 +0000 Subject: Merge with 1.8 of pulldom.py: Use types.UnicodeType if available, not type(u""). --- Lib/xml/dom/pulldom.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Lib/xml/dom/pulldom.py b/Lib/xml/dom/pulldom.py index 7f5ef79..5fc215a 100644 --- a/Lib/xml/dom/pulldom.py +++ b/Lib/xml/dom/pulldom.py @@ -1,5 +1,11 @@ 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" @@ -235,7 +241,7 @@ 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 [type(""), type(u"")]: + if type(stream_or_string) in _StringTypes: stream = open(stream_or_string) else: stream = stream_or_string -- cgit v0.12