diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-04-07 10:53:07 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-04-07 10:53:07 (GMT) |
| commit | 388bf30fe8e8368ea0600329a1a592b77f354fe5 (patch) | |
| tree | c3a1ea587b9702c16e5f0a7a84f900f903249213 | |
| parent | a9dd680d238a5296a8c537b715aadd60a5817120 (diff) | |
| parent | 4bea4615724319fad1c3c34066ff4411eacb8e51 (diff) | |
| download | cpython-388bf30fe8e8368ea0600329a1a592b77f354fe5.zip cpython-388bf30fe8e8368ea0600329a1a592b77f354fe5.tar.gz cpython-388bf30fe8e8368ea0600329a1a592b77f354fe5.tar.bz2 | |
Merge 3.4 (test_urllib2net)
| -rw-r--r-- | 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 index fc21408..17f9d1b 100644 --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -102,8 +102,6 @@ class OtherNetworkTests(unittest.TestCase): '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 @@ class TimeoutTest(unittest.TestCase): 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()) |