[Python-checkins] cpython (merge 3.4 -> default): Issue 21069: merge from 3.4

[ned.deily]

http://hg.python.org/cpython/rev/8d4cace71113
changeset:   89990:8d4cace71113
parent:      89988:ff27cb871b16
parent:      89989:adf1e04478b4
user:        Ned Deily <nad at acm.org>
date:        Thu Mar 27 01:40:16 2014 -0700
summary:
  Issue 21069: merge from 3.4

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
@@ -101,7 +101,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.example.com/", timeout=None) as open_url:
+        with self.urlopen("http://www.google.com/", timeout=None) 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: http://hg.python.org/cpython