summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2016-03-30 00:20:34 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2016-03-30 00:20:34 (GMT)
commit7f24a98a9aa01d6c548b3740fe3a5da409403c3d (patch)
treee60ec86cdbed186ce5b227544ca3470f619e13fd /Lib/test
parentb1511f789ea0565296cf9c64f30d2ab4e79b8615 (diff)
parent53f8ba52e6f64a7e352077a9a71507f4c042f7b2 (diff)
downloadcpython-7f24a98a9aa01d6c548b3740fe3a5da409403c3d.zip
cpython-7f24a98a9aa01d6c548b3740fe3a5da409403c3d.tar.gz
cpython-7f24a98a9aa01d6c548b3740fe3a5da409403c3d.tar.bz2
Merge 3.5 (test_urllibnet)
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_urllibnet.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index b9b9262..d5110a6 100644
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -104,7 +104,7 @@ class urlopenNetworkTests(unittest.TestCase):
@unittest.skipIf(sys.platform in ('win32',), 'not appropriate for Windows')
def test_fileno(self):
# Make sure fd returned by fileno is valid.
- with self.urlopen("http://www.google.com/", timeout=None) as open_url:
+ with self.urlopen("http://www.google.com/") as open_url:
fd = open_url.fileno()
with os.fdopen(fd, 'rb') as f:
self.assertTrue(f.read(), "reading from file created using fd "