#15377: Make posixpath.join() more strict when checking for str/bytes mix

Based on a patch by Nick Coghlan.
This commit is contained in:
Hynek Schlawack 2012-07-17 13:05:43 +02:00
parent eb3e62f1c8
commit c5a4566922
2 changed files with 18 additions and 13 deletions

View file

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