Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Lib/pathlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,10 @@ def _resolve(path, rest):
# parent dir
path, _, _ = path.rpartition(sep)
continue
newpath = path + sep + name
if path.endswith(sep):
newpath = path + name
else:
newpath = path + sep + name
if newpath in seen:
# Already seen this path
path = seen[newpath]
Expand Down
9 changes: 9 additions & 0 deletions Lib/test/test_pathlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -2349,6 +2349,15 @@ def test_open_mode(self):
st = os.stat(join('other_new_file'))
self.assertEqual(stat.S_IMODE(st.st_mode), 0o644)

def test_resolve_root(self):
current_directory = os.getcwd()
try:
os.chdir('/')
p = self.cls('spam')
self.assertEqual(str(p.resolve()), '/spam')
finally:
os.chdir(current_directory)

def test_touch_mode(self):
old_mask = os.umask(0)
self.addCleanup(os.umask, old_mask)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Fix pathlib.PosixPath to resolve a relative path located on the root
directory properly.