From d389cb5bcf890c327154f79240aacc41c5174722 Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <orsenthil@gmail.com>
Date: Tue, 21 Sep 2010 01:38:15 +0000
Subject: Fix Issue1327971: HTTPResponse should expose a proper fileno
 attribute

---
 Lib/httplib.py              |  3 +++
 Lib/test/test_httplib.py    |  7 +++++++
 Lib/test/test_urllib2net.py | 11 +++++++++++
 3 files changed, 21 insertions(+)

diff --git a/Lib/httplib.py b/Lib/httplib.py
index b1452f4..2f0356e 100644
--- a/Lib/httplib.py
+++ b/Lib/httplib.py
@@ -639,6 +639,9 @@ class HTTPResponse:
             amt -= len(chunk)
         return ''.join(s)
 
+    def fileno(self):
+        return self.fp.fileno()
+
     def getheader(self, name, default=None):
         if self.msg is None:
             raise ResponseNotReady()
diff --git a/Lib/test/test_httplib.py b/Lib/test/test_httplib.py
index 1fb810e..435a9fc 100644
--- a/Lib/test/test_httplib.py
+++ b/Lib/test/test_httplib.py
@@ -285,6 +285,13 @@ class BasicTest(TestCase):
         self.assertEqual("Basic realm=\"example\"",
                          resp.getheader("www-authenticate"))
 
+    def test_filenoattr(self):
+        # Just test the fileno attribute in the HTTPResponse Object.
+        body = "HTTP/1.1 200 Ok\r\n\r\nText"
+        sock = FakeSocket(body)
+        resp = httplib.HTTPResponse(sock)
+        self.assertTrue(hasattr(resp,'fileno'),
+                'HTTPResponse should expose a fileno attribute')
 
 class OfflineTest(TestCase):
     def test_responses(self):
diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index 76572b0..56e952d 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -161,6 +161,17 @@ class OtherNetworkTests(unittest.TestCase):
         self.assertEqual(res.geturl(),
                 "http://docs.python.org/glossary.html")
 
+    def test_fileno(self):
+        req = urllib2.Request("http://www.python.org")
+        opener = urllib2.build_opener()
+        res = opener.open(req)
+        try:
+            res.fileno()
+        except AttributeError:
+            self.fail("HTTPResponse object should return a valid fileno")
+        finally:
+            res.close()
+
     def _test_urls(self, urls, handlers, retry=True):
         import time
         import logging
-- 
cgit v0.12