[Python-checkins] cpython (merge 3.2 -> default): #15377: Make posixpath.join() more strict when checking for str/bytes mix

[hynek.schlawack]

http://hg.python.org/cpython/rev/d087ef80372d
changeset:   78151:d087ef80372d
parent:      78149:cb7e8ee489a1
parent:      78150:5553a53a230a
user:        Hynek Schlawack <hs at ox.cx>
date:        Tue Jul 17 13:10:15 2012 +0200
summary:
  #15377: Make posixpath.join() more strict when checking for str/bytes mix

Based on a patch by Nick Coghlan.

files:
  Lib/posixpath.py           |   9 +++++----
  Lib/test/test_posixpath.py |  22 +++++++++++++---------
  2 files changed, 18 insertions(+), 13 deletions(-)


diff --git a/Lib/posixpath.py b/Lib/posixpath.py
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -83,12 +83,13 @@
             else:
                 path += sep + b
     except TypeError:
-        strs = [isinstance(s, str) for s in (a, ) + p]
-        if any(strs) and not all(strs):
+        valid_types = all(isinstance(s, (str, bytes, bytearray))
+                          for s in (a, ) + p)
+        if valid_types:
+            # Must have a mixture of text and binary data
             raise TypeError("Can't mix strings and bytes in path "
                             "components.") from None
-        else:
-            raise
+        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
@@ -1,3 +1,4 @@
+import itertools
 import os
 import posixpath
 import sys
@@ -56,18 +57,21 @@
         self.assertEqual(posixpath.join(b"/foo/", b"bar/", b"baz/"),
                          b"/foo/bar/baz/")
 
-        # Check for friendly str/bytes mixing message
-        for args in [[b'bytes', 'str'],
-                     [bytearray(b'bytes'), 'str']]:
-            for _ in range(2):
+        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(
-                    "Can't mix strings and bytes in path components.",
-                    cm.exception.args[0]
-                )
-                args.reverse()  # check both orders
+                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.")
+        # regression, see #15377
+        with self.assertRaises(TypeError) as cm:
+            os.path.join(None, 'str')
+        self.assertNotEqual("Can't mix strings and bytes in path components.",
+                            cm.exception.args[0])
 
     def test_split(self):
         self.assertEqual(posixpath.split("/foo/bar"), ("/foo", "bar"))

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