Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/posixpath.py
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

20
Lib/test/test_posixpath.py
View File

@ -57,21 +57,17 @@ class PosixPathTest(unittest.TestCase):
self.assertEqual(posixpath.join(b"/foo/", b"bar/", b"baz/"),
b"/foo/bar/baz/")
def check_error_msg(list_of_args, msg):
"""Check posixpath.join raises friendly TypeErrors."""
for args in (item for perm in list_of_args
for item in itertools.permutations(perm)):
with self.assertRaises(TypeError) as cm:
posixpath.join(*args)
self.assertEqual(msg, cm.exception.args[0])
check_error_msg([[b'bytes', 'str'], [bytearray(b'bytes'), 'str']],
"Can't mix strings and bytes in path components.")
def test_join_errors(self):
# Check posixpath.join raises friendly TypeErrors.
errmsg = "Can't mix strings and bytes in path components"
with self.assertRaisesRegex(TypeError, errmsg):
posixpath.join(b'bytes', 'str')
with self.assertRaisesRegex(TypeError, errmsg):
posixpath.join('str', b'bytes')
# regression, see #15377
with self.assertRaises(TypeError) as cm:
posixpath.join(None, 'str')
self.assertNotEqual("Can't mix strings and bytes in path components.",
cm.exception.args[0])
self.assertNotEqual(cm.exception.args[0], errmsg)
def test_split(self):
self.assertEqual(posixpath.split("/foo/bar"), ("/foo", "bar"))