[Python-checkins] python/dist/src/Lib urllib2.py,1.65,1.66

[mhammond at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14811

Modified Files:
	urllib2.py 
Log Message:
Fix [ 738973 ] urllib2 CacheFTPHandler doesn't work on multiple dirs, as
implemented in patch [ 851736 ].


Index: urllib2.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/urllib2.py,v
retrieving revision 1.65
retrieving revision 1.66
diff -C2 -d -r1.65 -r1.66
*** urllib2.py	6 May 2004 01:41:26 -0000	1.65
--- urllib2.py	10 May 2004 07:35:33 -0000	1.66
***************
*** 1169,1173 ****
  
      def connect_ftp(self, user, passwd, host, port, dirs):
!         key = user, passwd, host, port
          if key in self.cache:
              self.timeout[key] = time.time() + self.delay
--- 1169,1173 ----
  
      def connect_ftp(self, user, passwd, host, port, dirs):
!         key = user, host, port, '/'.join(dirs)
          if key in self.cache:
              self.timeout[key] = time.time() + self.delay