From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sun, 24 Aug 2014 09:23:36 +0000 (+0300)
Subject: Issue #22034: Improve handling of wrong argument types in posixpath.join().
X-Git-Tag: v3.5.0a1~1014
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1fa36268cfdac3760de37859aa3ec1b5121248c5;p=python

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

1fa36268cfdac3760de37859aa3ec1b5121248c5
diff --cc Lib/posixpath.py
index eb17dbab07,0aa53feac2..f08c9310d4
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@@ -82,14 -82,12 +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:
 -        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
++    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
  
  
diff --cc Lib/test/test_posixpath.py
index 412849cff3,ec2fbaee32..d5a12a31dd
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@@ -57,21 -57,17 +57,21 @@@ 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:
++        errmsg = r'join\(\) argument must be str or bytes, not %r'
++        with self.assertRaisesRegex(TypeError, errmsg % 'NoneType'):
              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)
++        with self.assertRaisesRegex(TypeError, errmsg % 'NoneType'):
++            posixpath.join('str', None)
++        with self.assertRaisesRegex(TypeError, errmsg % 'bytearray'):
++            posixpath.join(bytearray(b'foo'), bytearray(b'bar'))
  
      def test_split(self):
          self.assertEqual(posixpath.split("/foo/bar"), ("/foo", "bar"))