[Python-checkins] cpython (3.4): Issue #22034: Got rid of misleading error message for bytearray arguments in

[serhiy.storchaka]

http://hg.python.org/cpython/rev/d9607a71456e
changeset:   92224:d9607a71456e
branch:      3.4
parent:      92222:dd1dffe6f0d2
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sun Aug 24 12:18:09 2014 +0300
summary:
  Issue #22034: Got rid of misleading error message for bytearray arguments in
posixpath.join().

files:
  Lib/posixpath.py           |   6 ++----
  Lib/test/test_posixpath.py |  20 ++++++++------------
  2 files changed, 10 insertions(+), 16 deletions(-)


diff --git a/Lib/posixpath.py b/Lib/posixpath.py
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -83,12 +83,10 @@
             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
 
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
--- 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"))

-- 
Repository URL: http://hg.python.org/cpython