[Python-checkins] cpython (merge 3.5 -> default): Merge 3.5 (test_urllibnet)

[victor.stinner]

https://hg.python.org/cpython/rev/9428e12d4370
changeset:   100793:9428e12d4370
parent:      100791:32539353eb95
parent:      100792:7bd4736195ce
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Wed Mar 30 02:20:34 2016 +0200
summary:
  Merge 3.5 (test_urllibnet)

files:
  Lib/test/test_urllibnet.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -104,7 +104,7 @@
     @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 "

-- 
Repository URL: https://hg.python.org/cpython