Issue #22034: Got rid of misleading error message for bytearray arguments in

posixpath.join().
This commit is contained in:
Serhiy Storchaka 2014-08-24 12:18:09 +03:00
parent d00aff2f62
commit 549c1972f2
2 changed files with 10 additions and 16 deletions

View file

@ -83,12 +83,10 @@ def join(a, *p):
else:
path += sep + b
except TypeError:
valid_types = all(isinstance(s, (str, bytes, bytearray))
for s in (a, ) + p)
if valid_types:
if all(isinstance(s, (str, bytes)) for s in (a,) + p):
# Must have a mixture of text and binary data
raise TypeError("Can't mix strings and bytes in path "
"components.") from None
"components") from None
raise
return path