From: Kristján Valur Jónsson <kristjan@ccpgames.com>
Date: Tue, 3 Feb 2009 10:57:52 +0000 (+0000)
Subject: r69209 caused the fp of HTTPResponse objects to be a io.BufferedReader instead of... 
X-Git-Tag: v3.1a1~294
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3bbfba841aadaf867f55da81b4608ae2d5e7f3e1;p=thirdparty%2FPython%2Fcpython.git

r69209 caused the fp of HTTPResponse objects to be a io.BufferedReader instead of a socket.SocketIO.  This moves the underlying socket.socket object from r.fp._sock to r.fp.raw._sock.  Since _sock is an internal object, this should be ok. The change is for the testsuite only, to assert socket state.
---

diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index a18a4bb983fc..ee0f67ef0149 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -195,7 +195,7 @@ class TimeoutTest(unittest.TestCase):
     def test_http_basic(self):
         self.assertTrue(socket.getdefaulttimeout() is None)
         u = _urlopen_with_retry("http://www.python.org")
-        self.assertTrue(u.fp._sock.gettimeout() is None)
+        self.assertTrue(u.fp.raw._sock.gettimeout() is None)
 
     def test_http_default_timeout(self):
         self.assertTrue(socket.getdefaulttimeout() is None)
@@ -204,7 +204,7 @@ class TimeoutTest(unittest.TestCase):
             u = _urlopen_with_retry("http://www.python.org")
         finally:
             socket.setdefaulttimeout(None)
-        self.assertEqual(u.fp._sock.gettimeout(), 60)
+        self.assertEqual(u.fp.raw._sock.gettimeout(), 60)
 
     def test_http_no_timeout(self):
         self.assertTrue(socket.getdefaulttimeout() is None)
@@ -213,11 +213,11 @@ class TimeoutTest(unittest.TestCase):
             u = _urlopen_with_retry("http://www.python.org", timeout=None)
         finally:
             socket.setdefaulttimeout(None)
-        self.assertTrue(u.fp._sock.gettimeout() is None)
+        self.assertTrue(u.fp.raw._sock.gettimeout() is None)
 
     def test_http_timeout(self):
         u = _urlopen_with_retry("http://www.python.org", timeout=120)
-        self.assertEqual(u.fp._sock.gettimeout(), 120)
+        self.assertEqual(u.fp.raw._sock.gettimeout(), 120)
 
     FTP_HOST = "ftp://ftp.mirror.nl/pub/mirror/gnu/"