mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-24 10:45:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #22034: Improve handling of wrong argument types in posixpath.join().

Browse source
This commit is contained in:
Serhiy Storchaka 2014-08-24 12:23:36 +03:00
commit 1fa36268cf
2 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Lib/posixpath.py
View file

@ -82,14 +82,13 @@ def join(a, *p):
path += b
else:
path += sep + b
except TypeError:
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.") from None
raise
except (TypeError, AttributeError):
for s in (a,) + p:
if not isinstance(s, (str, bytes)):
raise TypeError('join() argument must be str or bytes, not %r' %
s.__class__.__name__) from None
# Must have a mixture of text and binary data
raise TypeError("Can't mix strings and bytes in path components") from None
return path