summaryrefslogtreecommitdiffstats
path: root/Lib/posixpath.py
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-02-18 10:20:44 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-02-18 10:20:44 (GMT)
commit142d2bc3f11e8ad362e2e8b63c86445643a217be (patch)
tree12a8197c9722ac725e25633001cdf50fd78ca8f1 /Lib/posixpath.py
parentfbc737eda1f6dbe78e4de4f15fd7127f6cb585d4 (diff)
downloadcpython-142d2bc3f11e8ad362e2e8b63c86445643a217be.zip
cpython-142d2bc3f11e8ad362e2e8b63c86445643a217be.tar.gz
cpython-142d2bc3f11e8ad362e2e8b63c86445643a217be.tar.bz2
Fix posixpath.realpath() for multiple pardirs (fixes issue #6975).
Diffstat (limited to 'Lib/posixpath.py')
-rw-r--r--Lib/posixpath.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/posixpath.py b/Lib/posixpath.py
index 5b2513a..d65dc75 100644
--- 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):