From dd7ea896f24514bb2534b3762255e99f0aabc055 Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Tue, 21 Apr 2015 11:11:16 +1200
Subject: [PATCH] Return a named tuple from read_response

---
 netlib/http.py    | 18 +++++++++++++++---
 test/test_http.py |  8 +++++---
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/netlib/http.py b/netlib/http.py
index aacdd1d41..5501ce732 100644
--- a/netlib/http.py
+++ b/netlib/http.py
@@ -314,6 +314,18 @@ def parse_response_line(line):
     return (proto, code, msg)
 
 
+Response = collections.namedtuple(
+    "Response",
+    [
+        "httpversion",
+        "code",
+        "msg",
+        "headers",
+        "content"
+    ]
+)
+
+
 def read_response(rfile, request_method, body_size_limit, include_body=True):
     """
         Return an (httpversion, code, msg, headers, content) tuple.
@@ -352,7 +364,7 @@ def read_response(rfile, request_method, body_size_limit, include_body=True):
         # if include_body==False then a None content means the body should be
         # read separately
         content = None
-    return httpversion, code, msg, headers, content
+    return Response(httpversion, code, msg, headers, content)
 
 
 def read_http_body(*args, **kwargs):
@@ -531,8 +543,8 @@ def read_request(rfile, include_body=True, body_size_limit=None, wfile=None):
     if headers is None:
         raise HttpError(400, "Invalid headers")
 
-    expect_header = headers.get_first("expect")
-    if expect_header and expect_header.lower() == "100-continue" and httpversion >= (1, 1):
+    expect_header = headers.get_first("expect", "").lower()
+    if expect_header == "100-continue" and httpversion >= (1, 1):
         wfile.write(
             'HTTP/1.1 100 Continue\r\n'
             '\r\n'
diff --git a/test/test_http.py b/test/test_http.py
index 5bd7cab25..4f8ef2c51 100644
--- a/test/test_http.py
+++ b/test/test_http.py
@@ -254,15 +254,17 @@ class TestReadResponseNoContentLength(test.ServerTestBase):
     def test_no_content_length(self):
         c = tcp.TCPClient(("127.0.0.1", self.port))
         c.connect()
-        httpversion, code, msg, headers, content = http.read_response(c.rfile, "GET", None)
-        assert content == "bar\r\n\r\n"
+        resp = http.read_response(c.rfile, "GET", None)
+        assert resp.content == "bar\r\n\r\n"
 
 
 def test_read_response():
     def tst(data, method, limit, include_body=True):
         data = textwrap.dedent(data)
         r = cStringIO.StringIO(data)
-        return http.read_response(r, method, limit, include_body = include_body)
+        return http.read_response(
+            r, method, limit, include_body = include_body
+        )
 
     tutils.raises("server disconnect", tst, "", "GET", None)
     tutils.raises("invalid server response", tst, "foo", "GET", None)