Jan 27, 2023 · Jan 12, 2023 · Jan 12, 2023 · Jan 12, 2023 · Jan 12, 2023 · Jan 12, 2023
diff --git a/Lib/ntpath.py b/Lib/ntpath.py
    try:
        if not paths:
            path[:0] + sep  #23780: Ensure compatible data type even if p is null.
        result_drive, result_path =splitdrive(path)
        result_drive,result_root,result_path =splitroot(path)
        for p in map(os.fspath, paths):
            p_drive, p_path =splitdrive(p)
            ifp_path and p_path[0] in seps:
            p_drive,p_root,p_path =splitroot(p)
            ifp_root:
                # Second path is absolute
                if p_drive or not result_drive:
                    result_drive = p_drive
                result_root = p_root
                result_path = p_path
                continue
            elif p_drive and p_drive != result_drive:
                if p_drive.lower() != result_drive.lower():
                    # Different drives => ignore the first path entirely
                    result_drive = p_drive
                    result_root = p_root
                    result_path = p_path
                    continue
                # Same drive in different case
                result_path = result_path + sep
            result_path = result_path + p_path
        ## add separator between UNC and non-absolute path
        if (result_path andresult_path[0]notin seps and
        if (result_path and notresult_root and
            result_drive and result_drive[-1:] != colon):
            return result_drive + sep + result_path
        return result_drive + result_path
        return result_drive +result_root +result_path
    except (TypeError, AttributeError, BytesWarning):
        genericpath._check_arg_types('join', path, *paths)
        raise
    Either part may be empty."""
    p = os.fspath(p)
    seps = _get_bothseps(p)
    d, p =splitdrive(p)
    d,r,p =splitroot(p)
    # set i to index beyond p's last slash
    i = len(p)
    while i and p[i-1] not in seps:
        i -= 1
    head, tail = p[:i], p[i:]  # now tail has no slashes
    # remove trailing slashes from head, unless it's all slashes
    head = head.rstrip(seps) or head
    return d + head, tail
    return d + r + head.rstrip(seps), tail


 # Split a path in root and extension.
    path = os.fspath(path)
    seps = _get_bothseps(path)
    path = abspath(path)
    root, rest =splitdrive(path)
    ifroot androot[0] in seps:
        return(not rest) or (rest in seps)
    ifrest andrest in seps:
 drive,root, rest =splitroot(path)
    ifdrive anddrive[0] in seps:
        return not rest
    ifroot andnot rest:
        return True

    if _getvolumepathname:
            curdir = '.'
            pardir = '..'
        path = path.replace(altsep, sep)
 prefix,path =splitdrive(path)
 drive, root,path =splitroot(path)

        # collapse initial backslashes
        if path.startswith(sep):
            prefix += sep
            path = path.lstrip(sep)

        comps = path.split(sep)
        comps = path.lstrip(sep).split(sep)
        i = 0
        while i < len(comps):
            if not comps[i] or comps[i] == curdir:
                if i > 0 and comps[i-1] != pardir:
                    del comps[i-1:i+1]
                    i -= 1
                elif i == 0 andprefix.endswith(sep):
                elif i == 0 androot:
                    del comps[i]
                else:
                    i += 1
            else:
                i += 1
        # If the path is now empty, substitute '.'
        if notprefix and not comps:
        if notdrive and not root and not comps:
            comps.append(curdir)
        returnprefix + sep.join(comps)
        returndrive + root + sep.join(comps)

 else:
    def normpath(path):
    try:
        start_abs = abspath(normpath(start))
        path_abs = abspath(normpath(path))
        start_drive, start_rest =splitdrive(start_abs)
        path_drive, path_rest =splitdrive(path_abs)
        start_drive,_,start_rest =splitroot(start_abs)
        path_drive,_,path_rest =splitroot(path_abs)
        if normcase(start_drive) != normcase(path_drive):
            raise ValueError("path is on mount %r, start on mount %r" % (
                path_drive, start_drive))
        curdir = '.'

    try:
        drivesplits = [splitdrive(p.replace(altsep, sep).lower()) for p in paths]
        split_paths = [p.split(sep) for d, p in drivesplits]
        drivesplits = [splitroot(p.replace(altsep, sep).lower()) for p in paths]
        split_paths = [p.split(sep) for d,r,p in drivesplits]

        try:
            isabs, = set(p[:1] == sepfor d, p in drivesplits)
            isabs, = set(rfor d, r, p in drivesplits)
        except ValueError:
            raise ValueError("Can't mix absolute and relative paths") from None

        # Check that all drive letters or UNC paths match. The check is made only
        # now otherwise type errors for mixing strings and bytes would not be
        # caught.
        if len(set(d for d, p in drivesplits)) != 1:
        if len(set(d for d,r,p in drivesplits)) != 1:
            raise ValueError("Paths don't have the same drive")

        drive, path =splitdrive(paths[0].replace(altsep, sep))
        drive,root,path =splitroot(paths[0].replace(altsep, sep))
        common = path.split(sep)
        common = [c for c in common if c and c != curdir]

        else:
            common = common[:len(s1)]

        prefix = drive + sep if isabs else drive
        return prefix + sep.join(common)
        return drive + root + sep.join(common)
    except (TypeError, AttributeError):
        genericpath._check_arg_types('commonpath', *paths)
        raise
Original file line number	Diff line number	Diff line change
Expand Up		@@ -117,19 +117,21 @@ def join(path, *paths):
		try:
		if not paths:
		path[:0] + sep #23780: Ensure compatible data type even if p is null.
		result_drive, result_path =splitdrive(path)
		result_drive,result_root,result_path =splitroot(path)
		for p in map(os.fspath, paths):
		p_drive, p_path =splitdrive(p)
		ifp_path and p_path[0] in seps:
		p_drive,p_root,p_path =splitroot(p)
		ifp_root:
		# Second path is absolute
		if p_drive or not result_drive:
		result_drive = p_drive
		result_root = p_root
		result_path = p_path
		continue
		elif p_drive and p_drive != result_drive:
		if p_drive.lower() != result_drive.lower():
		# Different drives => ignore the first path entirely
		result_drive = p_drive
		result_root = p_root
		result_path = p_path
		continue
		# Same drive in different case
Expand All		@@ -139,10 +141,10 @@ def join(path, *paths):
		result_path = result_path + sep
		result_path = result_path + p_path
		## add separator between UNC and non-absolute path
		if (result_path andresult_path[0]notin seps and
		if (result_path and notresult_root and
		result_drive and result_drive[-1:] != colon):
		return result_drive + sep + result_path
		return result_drive + result_path
		return result_drive +result_root +result_path
		except (TypeError, AttributeError, BytesWarning):
		genericpath._check_arg_types('join', path, *paths)
		raise
Expand DownExpand Up		@@ -235,15 +237,13 @@ def split(p):
		Either part may be empty."""
		p = os.fspath(p)
		seps = _get_bothseps(p)
		d, p =splitdrive(p)
		d,r,p =splitroot(p)
		# set i to index beyond p's last slash
		i = len(p)
		while i and p[i-1] not in seps:
		i -= 1
		head, tail = p[:i], p[i:] # now tail has no slashes
		# remove trailing slashes from head, unless it's all slashes
		head = head.rstrip(seps) or head
		return d + head, tail
		return d + r + head.rstrip(seps), tail
barneygale marked this conversation as resolved. Show resolvedHide resolved


		# Split a path in root and extension.
Expand DownExpand Up		@@ -334,10 +334,10 @@ def ismount(path):
		path = os.fspath(path)
		seps = _get_bothseps(path)
		path = abspath(path)
		root, rest =splitdrive(path)
		ifroot androot[0] in seps:
		return(not rest) or (rest in seps)
		ifrest andrest in seps:
		drive,root, rest =splitroot(path)
		ifdrive anddrive[0] in seps:
		return not rest
		ifroot andnot rest:
		return True

		if _getvolumepathname:
Expand DownExpand Up		@@ -548,14 +548,9 @@ def normpath(path):
		curdir = '.'
		pardir = '..'
		path = path.replace(altsep, sep)
		prefix,path =splitdrive(path)
		drive, root,path =splitroot(path)

		# collapse initial backslashes
		if path.startswith(sep):
		prefix += sep
		path = path.lstrip(sep)

		comps = path.split(sep)
		comps = path.lstrip(sep).split(sep)
barneygale marked this conversation as resolved. OutdatedShow resolvedHide resolved
		i = 0
		while i < len(comps):
		if not comps[i] or comps[i] == curdir:
Expand All		@@ -564,16 +559,16 @@ def normpath(path):
		if i > 0 and comps[i-1] != pardir:
		del comps[i-1:i+1]
		i -= 1
		elif i == 0 andprefix.endswith(sep):
		elif i == 0 androot:
		del comps[i]
		else:
		i += 1
		else:
		i += 1
		# If the path is now empty, substitute '.'
		if notprefix and not comps:
		if notdrive and not root and not comps:
		comps.append(curdir)
		returnprefix + sep.join(comps)
		returndrive + root + sep.join(comps)

		else:
		def normpath(path):
Expand DownExpand Up		@@ -788,8 +783,8 @@ def relpath(path, start=None):
		try:
		start_abs = abspath(normpath(start))
		path_abs = abspath(normpath(path))
		start_drive, start_rest =splitdrive(start_abs)
		path_drive, path_rest =splitdrive(path_abs)
		start_drive,_,start_rest =splitroot(start_abs)
		path_drive,_,path_rest =splitroot(path_abs)
barneygale marked this conversation as resolved. Show resolvedHide resolved
		if normcase(start_drive) != normcase(path_drive):
		raise ValueError("path is on mount %r, start on mount %r" % (
		path_drive, start_drive))
Expand DownExpand Up		@@ -839,21 +834,21 @@ def commonpath(paths):
		curdir = '.'

		try:
		drivesplits = [splitdrive(p.replace(altsep, sep).lower()) for p in paths]
		split_paths = [p.split(sep) for d, p in drivesplits]
		drivesplits = [splitroot(p.replace(altsep, sep).lower()) for p in paths]
		split_paths = [p.split(sep) for d,r,p in drivesplits]

		try:
		isabs, = set(p[:1] == sepfor d, p in drivesplits)
		isabs, = set(rfor d, r, p in drivesplits)
		except ValueError:
		raise ValueError("Can't mix absolute and relative paths") from None

		# Check that all drive letters or UNC paths match. The check is made only
		# now otherwise type errors for mixing strings and bytes would not be
		# caught.
		if len(set(d for d, p in drivesplits)) != 1:
		if len(set(d for d,r,p in drivesplits)) != 1:
barneygale marked this conversation as resolved. OutdatedShow resolvedHide resolved
		raise ValueError("Paths don't have the same drive")

		drive, path =splitdrive(paths[0].replace(altsep, sep))
		drive,root,path =splitroot(paths[0].replace(altsep, sep))
		common = path.split(sep)
		common = [c for c in common if c and c != curdir]

Expand All		@@ -867,8 +862,7 @@ def commonpath(paths):
		else:
		common = common[:len(s1)]

		prefix = drive + sep if isabs else drive
		return prefix + sep.join(common)
		return drive + root + sep.join(common)
		except (TypeError, AttributeError):
		genericpath._check_arg_types('commonpath', *paths)
		raise
Expand Down