merge heads

1 files changed, 5 insertions, 4 deletions

diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index 84bcc13..7a4daa8b 100644
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -83,11 +83,12 @@ def join(a, *p):
             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.")
-        else:
-            raise
+        raise
     return path