mirror of https://github.com/python/cpython
SF patch #806246: use basestring where possible
(Contributed by George Yoshida.)
This commit is contained in:
parent
d21fd7bd86
commit
7a70ea4135
|
@ -1187,7 +1187,7 @@ def _normalize_module(module):
|
|||
module = sys._getframe(2).f_globals['__name__']
|
||||
module = sys.modules[module]
|
||||
|
||||
elif isinstance(module, (str, unicode)):
|
||||
elif isinstance(module, basestring):
|
||||
# The ["*"] at the end is a mostly meaningless incantation with
|
||||
# a crucial property: if, e.g., module is 'a.b.c', it convinces
|
||||
# __import__ to return c instead of a.
|
||||
|
|
|
@ -50,7 +50,7 @@ def extend_path(path, name):
|
|||
path = path[:] # Start with a copy of the existing path
|
||||
|
||||
for dir in sys.path:
|
||||
if not isinstance(dir, (str, unicode)) or not os.path.isdir(dir):
|
||||
if not isinstance(dir, basestring) or not os.path.isdir(dir):
|
||||
continue
|
||||
subdir = os.path.join(dir, pname)
|
||||
# XXX This may still add duplicate entries to path on
|
||||
|
|
|
@ -23,7 +23,7 @@ class BaseTestCase(unittest.TestCase):
|
|||
for i in range(len(textin)):
|
||||
result.append(" %d: %r" % (i, textin[i]))
|
||||
result = '\n'.join(result)
|
||||
elif isinstance(textin, (str, unicode)):
|
||||
elif isinstance(textin, basestring):
|
||||
result = " %s\n" % repr(textin)
|
||||
return result
|
||||
|
||||
|
|
Loading…
Reference in New Issue