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

diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index 5b2513ad16f6a1c5413f8841b50ebfb4610105ce..d65dc757b298e255e96969cd30b89b469de48b8c 100644 (file)
--- a/Lib/posixpath.py
+++ b/Lib/posixpath.py
@@ -382,9 +382,11 @@ def _joinrealpath(path, rest, seen):
         if name == pardir:
             # parent dir
             if path:
-                path = dirname(path)
+                path, name = split(path)
+                if name == pardir:
+                    path = join(path, pardir, pardir)
             else:
-                path = name
+                path = pardir
             continue
         newpath = join(path, name)
         if not islink(newpath):

diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py
index 23def061368d0102ec8c1e040add0029a15f2f86..7443e3001bd65026201ba5af1a5517b1bdf34796 100644 (file)
--- a/Lib/test/test_posixpath.py
+++ b/Lib/test/test_posixpath.py
@@ -214,6 +214,16 @@ class PosixPathTest(unittest.TestCase):
         self.assertEqual(posixpath.normpath("///foo/.//bar//.//..//.//baz"), "/foo/baz")
         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"):
         def test_realpath_basic(self):
             # Basic operation.