From: Guido van Rossum <guido@python.org>
Date: Wed, 18 Aug 1999 17:40:33 +0000 (+0000)
Subject: Patches by Michael Reilly to correctly deal with ftp URLs of the form
X-Git-Tag: v1.6a1~1005
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e006a3cc32b26dcb9dce4dd6875c72fc815c108;p=thirdparty%2FPython%2Fcpython.git

Patches by Michael Reilly to correctly deal with ftp URLs of the form
ftp://user@host//root/path: the double slash in the pathname means to
go to the root directory even if the initial directory isn't the root.
---

diff --git a/Lib/urllib.py b/Lib/urllib.py
index ad1e791386cc..4bd329f2645d 100644
--- a/Lib/urllib.py
+++ b/Lib/urllib.py
@@ -362,6 +362,7 @@ class URLopener:
         dirs = string.splitfields(path, '/')
         dirs, file = dirs[:-1], dirs[-1]
         if dirs and not dirs[0]: dirs = dirs[1:]
+        if dirs and not dirs[0]: dirs[0] = '/'
         key = (user, host, port, string.joinfields(dirs, '/'))
         # XXX thread unsafe!
         if len(self.ftpcache) > MAXFTPCACHE: