summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_posixpath.py
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2012-07-15 14:21:30 (GMT)
committerHynek Schlawack <hs@ox.cx>2012-07-15 14:21:30 (GMT)
commit4774946c3b7564b4a1c93da4ba4dba443a36a708 (patch)
tree2c668f86fdb8f658f7eb73bf04f46139d92fb627 /Lib/test/test_posixpath.py
parenta3d1cac4b21ffbd8deed0c28f08bed4afa5e7b83 (diff)
downloadcpython-4774946c3b7564b4a1c93da4ba4dba443a36a708.zip
cpython-4774946c3b7564b4a1c93da4ba4dba443a36a708.tar.gz
cpython-4774946c3b7564b4a1c93da4ba4dba443a36a708.tar.bz2
#15180: Clarify posixpath.join() error message when mixing str & bytes
Diffstat (limited to 'Lib/test/test_posixpath.py')
-rw-r--r--Lib/test/test_posixpath.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index a7a3e4a..54de0cf 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -56,8 +56,15 @@ class PosixPathTest(unittest.TestCase):
self.assertEqual(posixpath.join(b"/foo/", b"bar/", b"baz/"),
b"/foo/bar/baz/")
- self.assertRaises(TypeError, posixpath.join, b"bytes", "str")
- self.assertRaises(TypeError, posixpath.join, "str", b"bytes")
+ with self.assertRaises(TypeError) as e:
+ posixpath.join(b'bytes', 'str')
+ self.assertIn("Can't mix strings and bytes", e.args[0])
+ with self.assertRaises(TypeError) as e:
+ posixpath.join('str', b'bytes')
+ self.assertIn("Can't mix strings and bytes", e.args[0])
+ with self.assertRaises(TypeError) as e:
+ posixpath.join('str', bytearray(b'bytes'))
+ self.assertIn("Can't mix strings and bytes", e.args[0])
def test_split(self):
self.assertEqual(posixpath.split("/foo/bar"), ("/foo", "bar"))