From: Martin v. Löwis <martin@v.loewis.de>
Date: Thu, 28 Dec 2000 18:43:02 +0000 (+0000)
Subject: Merge with 1.8 of pulldom.py:
X-Git-Tag: v2.1a1~473
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=011ea47577eca09abe0d78aece95618e66554f66;p=python

Merge with 1.8 of pulldom.py:
Use types.UnicodeType if available, not type(u"").
---

diff --git a/Lib/xml/dom/pulldom.py b/Lib/xml/dom/pulldom.py
index 7f5ef79739..5fc215ab73 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