[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 (test_urllib2net)
victor.stinner
python-checkins at python.org
Tue Apr 7 13:00:33 CEST 2015
https://hg.python.org/cpython/rev/6ed381537e6c
changeset: 95470:6ed381537e6c
parent: 95468:1a72c0a1a50f
parent: 95469:40ddcd785f7b
user: Victor Stinner <victor.stinner at gmail.com>
date: Tue Apr 07 12:53:07 2015 +0200
summary:
Merge 3.4 (test_urllib2net)
files:
Lib/test/test_urllib2net.py | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -102,8 +102,6 @@
'ftp://ftp.debian.org/debian/README',
('ftp://ftp.debian.org/debian/non-existent-file',
None, urllib.error.URLError),
- 'ftp://gatekeeper.research.compaq.com/pub/DEC/SRC'
- '/research-reports/00README-Legal-Rules-Regs',
]
self._test_urls(urls, self._extra_handlers())
@@ -291,7 +289,7 @@
self.addCleanup(u.close)
self.assertEqual(u.fp.raw._sock.gettimeout(), 120)
- FTP_HOST = "ftp://ftp.mirror.nl/pub/gnu/"
+ FTP_HOST = 'ftp://ftp.debian.org/debian/'
def test_ftp_basic(self):
self.assertIsNone(socket.getdefaulttimeout())
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list