From 54a1d0bc699ea0cbe4fbe79dfe3ddcd427ab807e Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 11 Apr 1997 19:09:51 +0000 Subject: [PATCH] (Jack+Guido:) interpret ../ in basejoin() according to RFC1808. --- Lib/urllib.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Lib/urllib.py b/Lib/urllib.py index e57311b519b..a8a579bb906 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -592,6 +592,13 @@ def basejoin(base, url): else: # remove last file component basepath = basepath[:i+1] + # Interpret ../ (important because of symlinks) + while basepath and path[:3] == '../': + path = path[3:] + i = string.rfind(basepath, '/') + if i > 0: + basepath = basepath[:i-1] + path = basepath + path if type and host: return type + '://' + host + path elif type: return type + ':' + path