Commit 142d2bc3 authored by Serhiy Storchaka's avatar Serhiy Storchaka

Fix posixpath.realpath() for multiple pardirs (fixes issue #6975).

parent fbc737ed
...@@ -382,9 +382,11 @@ def _joinrealpath(path, rest, seen): ...@@ -382,9 +382,11 @@ def _joinrealpath(path, rest, seen):
if name == pardir: if name == pardir:
# parent dir # parent dir
if path: if path:
path = dirname(path) path, name = split(path)
if name == pardir:
path = join(path, pardir, pardir)
else: else:
path = name path = pardir
continue continue
newpath = join(path, name) newpath = join(path, name)
if not islink(newpath): if not islink(newpath):
......
...@@ -214,6 +214,16 @@ class PosixPathTest(unittest.TestCase): ...@@ -214,6 +214,16 @@ class PosixPathTest(unittest.TestCase):
self.assertEqual(posixpath.normpath("///foo/.//bar//.//..//.//baz"), "/foo/baz") self.assertEqual(posixpath.normpath("///foo/.//bar//.//..//.//baz"), "/foo/baz")
self.assertEqual(posixpath.normpath("///..//./foo/.//bar"), "/foo/bar") self.assertEqual(posixpath.normpath("///..//./foo/.//bar"), "/foo/bar")
def test_realpath_curdir(self):
self.assertEqual(realpath('.'), os.getcwd())
self.assertEqual(realpath('./.'), os.getcwd())
self.assertEqual(realpath('/'.join(['.'] * 100)), os.getcwd())
def test_realpath_pardir(self):
self.assertEqual(realpath('..'), dirname(os.getcwd()))
self.assertEqual(realpath('../..'), dirname(dirname(os.getcwd())))
self.assertEqual(realpath('/'.join(['..'] * 100)), '/')
if hasattr(os, "symlink"): if hasattr(os, "symlink"):
def test_realpath_basic(self): def test_realpath_basic(self):
# Basic operation. # Basic operation.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment