diff options
| author | Guido van Rossum <guido@python.org> | 2007-10-16 18:12:55 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-10-16 18:12:55 (GMT) |
| commit | 3172c5d263eeffff1e89d03d79be3ccc1d60fbde (patch) | |
| tree | a35e103b36b684c4682ded57236199d6a0ecee4b /Lib/xml | |
| parent | 60d241f135f10312f5a638846659d7e471f6cac9 (diff) | |
| download | cpython-3172c5d263eeffff1e89d03d79be3ccc1d60fbde.zip cpython-3172c5d263eeffff1e89d03d79be3ccc1d60fbde.tar.gz cpython-3172c5d263eeffff1e89d03d79be3ccc1d60fbde.tar.bz2 | |
Patch# 1258 by Christian Heimes: kill basestring.
I like this because it makes the code shorter! :-)
Diffstat (limited to 'Lib/xml')
| -rw-r--r-- | Lib/xml/dom/pulldom.py | 2 | ||||
| -rw-r--r-- | Lib/xml/sax/saxutils.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/xml/dom/pulldom.py b/Lib/xml/dom/pulldom.py index c15618f..81a36b0 100644 --- a/Lib/xml/dom/pulldom.py +++ b/Lib/xml/dom/pulldom.py @@ -325,7 +325,7 @@ default_bufsize = (2 ** 14) - 20 def parse(stream_or_string, parser=None, bufsize=None): if bufsize is None: bufsize = default_bufsize - if isinstance(stream_or_string, basestring): + if isinstance(stream_or_string, str): stream = open(stream_or_string) else: stream = stream_or_string diff --git a/Lib/xml/sax/saxutils.py b/Lib/xml/sax/saxutils.py index a4bcb08..a569c1d 100644 --- a/Lib/xml/sax/saxutils.py +++ b/Lib/xml/sax/saxutils.py @@ -272,7 +272,7 @@ def prepare_input_source(source, base = ""): """This function takes an InputSource and an optional base URL and returns a fully resolved InputSource object ready for reading.""" - if isinstance(source, basestring): + if isinstance(source, str): source = xmlreader.InputSource(source) elif hasattr(source, "read"): f = source |