bpo-33660: Fix PosixPath to resolve a relative path on root (GH-21975) · python/cpython@7475aa2

bpo-33660: Fix PosixPath to resolve a relative path on root (GH-21975) · python/cpython@7475aa2

3 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,10 @@ def _resolve(path, rest):`
`329`	`329`	`# parent dir`
`330`	`330`	`path, _, _ = path.rpartition(sep)`
`331`	`331`	`continue`
`332`		`-newpath = path + sep + name`
	`332`	`+if path.endswith(sep):`
	`333`	`+newpath = path + name`
	`334`	`+else:`
	`335`	`+newpath = path + sep + name`
`333`	`336`	`if newpath in seen:`
`334`	`337`	`# Already seen this path`
`335`	`338`	`path = seen[newpath]`

Original file line number	Diff line number	Diff line change
`@@ -2214,6 +2214,15 @@ def test_open_mode(self):`
`2214`	`2214`	`st = os.stat(join('other_new_file'))`
`2215`	`2215`	`self.assertEqual(stat.S_IMODE(st.st_mode), 0o644)`
`2216`	`2216`
	`2217`	`+def test_resolve_root(self):`
	`2218`	`+current_directory = os.getcwd()`
	`2219`	`+try:`
	`2220`	`+os.chdir('/')`
	`2221`	`+p = self.cls('spam')`
	`2222`	`+self.assertEqual(str(p.resolve()), '/spam')`
	`2223`	`+finally:`
	`2224`	`+os.chdir(current_directory)`
	`2225`	`+`
`2217`	`2226`	`def test_touch_mode(self):`
`2218`	`2227`	`old_mask = os.umask(0)`
`2219`	`2228`	`self.addCleanup(os.umask, old_mask)`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix pathlib.PosixPath to resolve a relative path located on the root`
	`2`	`+directory properly.`