From: Nice Zombies <nineteendo19d0@gmail.com>
Date: Sun, 14 Apr 2024 21:04:14 +0000 (+0200)
Subject: gh-117636: Remove redundant type check in `os.path.join()` (#117638)
X-Git-Tag: v3.13.0b1~432
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ee94d139197c0df8f4e096957576d124ad31c8e;p=thirdparty%2FPython%2Fcpython.git

gh-117636: Remove redundant type check in `os.path.join()` (#117638)
---

diff --git a/Lib/ntpath.py b/Lib/ntpath.py
index f5d1a2195dd6..aba18bfe407a 100644
--- a/Lib/ntpath.py
+++ b/Lib/ntpath.py
@@ -108,8 +108,6 @@ def join(path, *paths):
         seps = '\\/'
         colon_seps = ':\\/'
     try:
-        if not paths:
-            path[:0] + sep  #23780: Ensure compatible data type even if p is null.
         result_drive, result_root, result_path = splitroot(path)
         for p in paths:
             p_drive, p_root, p_path = splitroot(p)
diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index 8fd49cdc3589..dd29fbb1614a 100644
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -77,13 +77,11 @@ def join(a, *p):
     sep = _get_sep(a)
     path = a
     try:
-        if not p:
-            path[:0] + sep  #23780: Ensure compatible data type even if p is null.
         for b in p:
             b = os.fspath(b)
-            if b.startswith(sep):
+            if b.startswith(sep) or not path:
                 path = b
-            elif not path or path.endswith(sep):
+            elif path.endswith(sep):
                 path += b
             else:
                 path += sep + b
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 248fe2cc5d5c..7c122e6204b1 100644
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -56,6 +56,8 @@ class PosixPathTest(unittest.TestCase):
         self.assertEqual(fn(b"/foo", b"bar", b"baz"),          b"/foo/bar/baz")
         self.assertEqual(fn(b"/foo/", b"bar/", b"baz/"),       b"/foo/bar/baz/")
 
+        self.assertEqual(fn("a", ""),          "a/")
+        self.assertEqual(fn("a", "", ""),      "a/")
         self.assertEqual(fn("a", "b"),         "a/b")
         self.assertEqual(fn("a", "b/"),        "a/b/")
         self.assertEqual(fn("a/", "b"),        "a/b")
diff --git a/Misc/NEWS.d/next/Core and Builtins/2024-04-08-14-33-38.gh-issue-117636.exnRKd.rst b/Misc/NEWS.d/next/Core and Builtins/2024-04-08-14-33-38.gh-issue-117636.exnRKd.rst
new file mode 100644
index 000000000000..7d7cb5063521
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2024-04-08-14-33-38.gh-issue-117636.exnRKd.rst	
@@ -0,0 +1 @@
+Speedup :func:`os.path.join`.