Mar 24, 2024 · Mar 24, 2024 · Mar 26, 2024 · Mar 26, 2024 · Mar 26, 2024 · Mar 26, 2024
diff --git a/Lib/posixpath.py b/Lib/posixpath.py

 def commonpath(paths):
    """Given a sequence of path names, returns the longest common sub-path."""
    _, roots, tails = zip(*map(splitroot, paths))
    if not roots:
        raise ValueError('commonpath() arg is an empty sequence')

    paths = tuple(map(os.fspath, paths))
    try:
        prefix = min(roots)
    except (TypeError, AttributeError):
        genericpath._check_arg_types('commonpath', *paths)
        raise

    if notpaths:
        raise ValueError('commonpath() arg is an empty sequence')
    if notprefix and max(roots):
        raise ValueError("Can't mix absolute and relative paths")

    if isinstance(paths[0], bytes):
    if isinstance(prefix, bytes):
        sep = b'/'
        curdir = b'.'
    else:
        sep = '/'
        curdir = '.'

    try:
        split_paths = [path.split(sep) for path in paths]

        try:
            isabs, = set(p[:1] == sep for p in paths)
        except ValueError:
            raise ValueError("Can't mix absolute and relative paths") from None

        split_paths = [[c for c in s if c and c != curdir] for s in split_paths]
        s1 = min(split_paths)
        s2 = max(split_paths)
    split_paths = [
        [c for c in tail.split(sep) if c and c != curdir] for tail in tails
    ]
    s1 = min(split_paths)
    s2 = max(split_paths)
    for i, c in enumerate(s1):
        if c != s2[i]:
            common = s1[:i]
            break
    else:
        common = s1
        for i, c in enumerate(s1):
            if c != s2[i]:
                common = s1[:i]
                break

        prefix = sep if isabs else sep[:0]
        return prefix + sep.join(common)
    except (TypeError, AttributeError):
        genericpath._check_arg_types('commonpath', *paths)
        raise
    return prefix + sep.join(common)
diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
        self.assertRaises(TypeError, posixpath.commonpath,
                          ['usr/lib/', b'/usr/lib/python3'])

        # gh-117201: `posixpath.commonpath` doesn't handle leading `//` properly
        check(['//foo/bar', '//foo/baz'], '//foo')


 class PosixCommonTest(test_genericpath.CommonTest, unittest.TestCase):
    pathmodule = posixpath
Original file line number	Diff line number	Diff line change
Expand Up		@@ -545,38 +545,36 @@ def relpath(path, start=None):

		def commonpath(paths):
		"""Given a sequence of path names, returns the longest common sub-path."""
		_, roots, tails = zip(*map(splitroot, paths))
		if not roots:
		raise ValueError('commonpath() arg is an empty sequence')

		paths = tuple(map(os.fspath, paths))
		try:
		prefix = min(roots)
		except (TypeError, AttributeError):
		genericpath._check_arg_types('commonpath', *paths)
		raise

		if notpaths:
		raise ValueError('commonpath() arg is an empty sequence')
		if notprefix and max(roots):
		raise ValueError("Can't mix absolute and relative paths")

		if isinstance(paths[0], bytes):
		if isinstance(prefix, bytes):
		sep = b'/'
		curdir = b'.'
		else:
		sep = '/'
		curdir = '.'

		try:
		split_paths = [path.split(sep) for path in paths]

		try:
		isabs, = set(p[:1] == sep for p in paths)
		except ValueError:
		raise ValueError("Can't mix absolute and relative paths") from None

		split_paths = [[c for c in s if c and c != curdir] for s in split_paths]
		s1 = min(split_paths)
		s2 = max(split_paths)
		split_paths = [
		[c for c in tail.split(sep) if c and c != curdir] for tail in tails
		]
		s1 = min(split_paths)
		s2 = max(split_paths)
		for i, c in enumerate(s1):
		if c != s2[i]:
		common = s1[:i]
		break
		else:
		common = s1
		for i, c in enumerate(s1):
		if c != s2[i]:
		common = s1[:i]
		break

		prefix = sep if isabs else sep[:0]
		return prefix + sep.join(common)
		except (TypeError, AttributeError):
		genericpath._check_arg_types('commonpath', *paths)
		raise
		return prefix + sep.join(common)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -749,6 +749,9 @@ def check_error(exc, paths):
		self.assertRaises(TypeError, posixpath.commonpath,
		['usr/lib/', b'/usr/lib/python3'])

		# gh-117201: `posixpath.commonpath` doesn't handle leading `//` properly
		check(['//foo/bar', '//foo/baz'], '//foo')


		class PosixCommonTest(test_genericpath.CommonTest, unittest.TestCase):
		pathmodule = posixpath
Expand Down