Author: neal.norwitz
Date: Sat Jan 26 20:49:41 2008
New Revision: 60328
Modified:
python/branches/py3k/Lib/test/test_urllib2net.py
Log:
Get this test to pass
Modified: python/branches/py3k/Lib/test/test_urllib2net.py
==============================================================================
--- python/branches/py3k/Lib/test/test_urllib2net.py (original)
+++ python/branches/py3k/Lib/test/test_urllib2net.py Sat Jan 26 20:49:41 2008
@@ -17,7 +17,8 @@
for i in range(3):
try:
return urllib2.urlopen(host, *args, **kwargs)
- except urllib2.URLError as last_exc:
+ except urllib2.URLError as e:
+ last_exc = e
continue
except:
raise
@@ -310,13 +311,13 @@
socket.setdefaulttimeout(60)
try:
u = _urlopen_with_retry(self.FTP_HOST, timeout=None)
- self.assertEqual(u.fp.fp._sock.gettimeout(), 60)
+ self.assertEqual(u.fp.fp.raw._sock.gettimeout(), 60)
finally:
socket.setdefaulttimeout(prev)
def test_ftp_NoneNodefault(self):
u = _urlopen_with_retry(self.FTP_HOST, timeout=None)
- self.assertTrue(u.fp.fp._sock.gettimeout() is None)
+ self.assertTrue(u.fp.fp.raw._sock.gettimeout() is None)
def test_ftp_Value(self):
u = _urlopen_with_retry(self.FTP_HOST, timeout=60)
_______________________________________________
Python-3000-checkins mailing list
Python-3000-checkins@python.org
http://mail.python.org/mailman/listinfo/python-3000-checkins
