Issue #22034: Got rid of misleading error message for bytearray arguments in
posixpath.join().
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 412849c..ec2fbae 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -57,21 +57,17 @@
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"))