#15180: Clarify posixpath.join() error message when mixing str & bytes

1 files changed, 14 insertions, 6 deletions

diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index 9570a36..ab2aeff 100644
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -74,13 +74,21 @@ def join(a, *p):
     will be discarded."""
     sep = _get_sep(a)
     path = a
-    for b in p:
-        if b.startswith(sep):
-            path = b
-        elif not path or path.endswith(sep):
-            path +=  b
+    try:
+        for b in p:
+            if b.startswith(sep):
+                path = b
+            elif not path or path.endswith(sep):
+                path += b
+            else:
+                path += sep + b
+    except TypeError:
+        strs = [isinstance(s, str) for s in (a, ) + p]
+        if any(strs) and not all(strs):
+            raise TypeError("Can't mix strings and bytes in path "
+                            "components.") from None
         else:
-            path += sep + b
+            raise
     return path