Use HTTPHeaderMap instead of list in stream class

Author: irvind

hyper/http20/stream.py

@@ -61,7 +61,7 @@ def __init__(self,
                  local_closed=False):
         self.stream_id = stream_id
         self.state = STATE_HALF_CLOSED_LOCAL if local_closed else STATE_IDLE
-        self.headers = []
+        self.headers = HTTPHeaderMap()
 
         # Set to a key-value set of the response headers once their
         # HEADERS..CONTINUATION frame sequence finishes.
@@ -113,18 +113,11 @@ def add_header(self, name, value, replace=False):
         """
         Adds a single HTTP header to the headers to be sent on the request.
         """
-        name = name.lower()
-
-        if replace:
-            try:
-                idx = [n for n, _ in self.headers].index(name)
-                self.headers[idx] = (name, value)
-                return
+        if not replace:
+            self.headers[name] = value
+        else:
+            self.headers.replace(name, value)
 
-            except ValueError:
-                pass
-        
-        self.headers.append((name, value))
 
     def send_data(self, data, final):
         """
@@ -279,8 +272,11 @@ def open(self, end):
         The `end` flag controls whether this will be the end of the stream, or
         whether data will follow.
         """
+        headers = list(self.headers.items())
+
         # Strip any headers invalid in H2.
-        headers = h2_safe_headers(self.headers)
+        headers = h2_safe_headers(headers)
+
         # Encode the headers.
         encoded_headers = self._encoder.encode(headers)
 

test/test_hyper.py

@@ -18,7 +18,7 @@
     combine_repeated_headers, split_repeated_headers, h2_safe_headers
 )
 from hyper.common.headers import HTTPHeaderMap
-from hyper.compat import zlib_compressobj
+from hyper.compat import zlib_compressobj, is_py2
 from hyper.contrib import HTTP20Adapter
 import hyper.http20.errors as errors
 import errno
@@ -87,11 +87,11 @@ def test_putrequest_autosets_headers(self):
         c.putrequest('GET', '/')
         s = c.recent_stream
 
-        assert s.headers == [
-            (':method', 'GET'),
-            (':scheme', 'https'),
-            (':authority', 'www.google.com'),
-            (':path', '/'),
+        assert list(s.headers.items()) == [
+            (b':method', b'GET'),
+            (b':scheme', b'https'),
+            (b':authority', b'www.google.com'),
+            (b':path', b'/'),
         ]
 
     def test_putheader_puts_headers(self):
@@ -101,12 +101,12 @@ def test_putheader_puts_headers(self):
         c.putheader('name', 'value')
         s = c.recent_stream
 
-        assert s.headers == [
-            (':method', 'GET'),
-            (':scheme', 'https'),
-            (':authority', 'www.google.com'),
-            (':path', '/'),
-            ('name', 'value'),
+        assert list(s.headers.items()) == [
+            (b':method', b'GET'),
+            (b':scheme', b'https'),
+            (b':authority', b'www.google.com'),
+            (b':path', b'/'),
+            (b'name', b'value'),
         ]
 
     def test_putheader_replaces_headers(self):
@@ -118,12 +118,12 @@ def test_putheader_replaces_headers(self):
         c.putheader('name', 'value2', replace=True)
         s = c.recent_stream
 
-        assert s.headers == [
-            (':method', 'GET'),
-            (':scheme', 'https'),
-            (':authority', 'www.example.org'),
-            (':path', '/'),
-            ('name', 'value2'),
+        assert list(s.headers.items()) == [
+            (b':method', b'GET'),
+            (b':scheme', b'https'),
+            (b':authority', b'www.example.org'),
+            (b':path', b'/'),
+            (b'name', b'value2'),
         ]
 
     def test_endheaders_sends_data(self):
@@ -519,11 +519,11 @@ def test_that_using_proxy_keeps_http_headers_intact(self):
         c.request('GET', '/')
         s = c.recent_stream
 
-        assert s.headers == [
-            (':method', 'GET'),
-            (':scheme', 'http'),
-            (':authority', 'www.google.com'),
-            (':path', '/'),
+        assert list(s.headers.items()) == [
+            (b':method', b'GET'),
+            (b':scheme', b'http'),
+            (b':authority', b'www.google.com'),
+            (b':path', b'/'),
         ]
 
 class TestServerPush(object):
@@ -694,28 +694,28 @@ def test_streams_have_ids(self):
 
     def test_streams_initially_have_no_headers(self):
         s = Stream(1, None, None, None, None, None, None)
-        assert s.headers == []
+        assert list(s.headers.items()) == []
 
     def test_streams_can_have_headers(self):
         s = Stream(1, None, None, None, None, None, None)
         s.add_header("name", "value")
-        assert s.headers == [("name", "value")]
+        assert list(s.headers.items()) == [(b"name", b"value")]
 
     def test_streams_can_replace_headers(self):
         s = Stream(1, None, None, None, None, None, None)
         s.add_header("name", "value")
         s.add_header("name", "other_value", replace=True)
 
-        assert s.headers == [("name", "other_value")]
+        assert list(s.headers.items()) == [(b"name", b"other_value")]
 
     def test_streams_can_replace_none_headers(self):
         s = Stream(1, None, None, None, None, None, None)
         s.add_header("name", "value")
         s.add_header("other_name", "other_value", replace=True)
 
-        assert s.headers == [
-            ("name", "value"),
-            ("other_name", "other_value")
+        assert list(s.headers.items()) == [
+            (b"name", b"value"),
+            (b"other_name", b"other_value")
         ]
 
     def test_stream_opening_sends_headers(self):
@@ -1485,7 +1485,17 @@ def test_connection_error_when_send_out_of_range_frame(self):
 class NullEncoder(object):
     @staticmethod
     def encode(headers):
-        return '\n'.join("%s%s" % (name, val) for name, val in headers)
+        
+        def to_str(v):
+            if is_py2:
+                return str(v)
+            else:
+                if not isinstance(v, str):
+                    v = str(v, 'utf-8')
+                return v
+
+        return '\n'.join("%s%s" % (to_str(name), to_str(val)) 
+                         for name, val in headers)
 
 class FixedDecoder(object):
     def __init__(self, result):