mirror of
https://github.com/python/cpython
synced 2026-09-29 12:10:30 +03:00
Patch# 1258 by Christian Heimes: kill basestring.
I like this because it makes the code shorter! :-)
This commit is contained in:
parent
60d241f135
commit
3172c5d263
77 changed files with 171 additions and 217 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue