summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorMark Hammond <mhammond@skippinet.com.au>2004-05-10 07:35:33 (GMT)
committerMark Hammond <mhammond@skippinet.com.au>2004-05-10 07:35:33 (GMT)
commitc533c986e8c2a009d3eb49a44c1b6de28fcd982c (patch)
treea02009a42c039fcd3869ae293040d2456ed9d4a1 /Lib
parentd2856008839aa2dd06893701db6be2333eef5f24 (diff)
downloadcpython-c533c986e8c2a009d3eb49a44c1b6de28fcd982c.zip
cpython-c533c986e8c2a009d3eb49a44c1b6de28fcd982c.tar.gz
cpython-c533c986e8c2a009d3eb49a44c1b6de28fcd982c.tar.bz2
Fix [ 738973 ] urllib2 CacheFTPHandler doesn't work on multiple dirs, as
implemented in patch [ 851736 ].
Diffstat (limited to 'Lib')
-rw-r--r--Lib/urllib2.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 1984cf2..773cd7d 100644
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -1168,7 +1168,7 @@ class CacheFTPHandler(FTPHandler):
self.max_conns = m
def connect_ftp(self, user, passwd, host, port, dirs):
- key = user, passwd, host, port
+ key = user, host, port, '/'.join(dirs)
if key in self.cache:
self.timeout[key] = time.time() + self.delay
else: