Made some review changes

Author: fredthomsen

hyper/common/connection.py

@@ -92,7 +92,7 @@ def request(self, method, url, body=None, headers={}):
             # the world of HTTP/2. Replace the backing object and insert the
             # socket into it.
             assert e.negotiated in H2_NPN_PROTOCOLS
-    
+
             self._conn = HTTP20Connection(
                 self._host, self._port, **self._h2_kwargs
             )

hyper/http11/connection.py

@@ -132,15 +132,9 @@ def request(self, method, url, body=None, headers={}):
 
         if self._sock is None:
             self.connect()
-
-        #add HTTP Upgrade headers
-        headers[b'connection'] = b'Upgrade, HTTP2-Settings'
-        headers[b'upgrade'] = H2C_PROTOCOL
 
-        #need to encode SETTINGS frame payload in Base64 and put into the HTTP-2 Settings header 
-        http2_settings = SettingsFrame(0)
-        http2_settings.settings[SettingsFrame.INITIAL_WINDOW_SIZE] = 65535
-        headers[b'HTTP2-Settings'] = base64.b64encode(http2_settings.serialize_body())
+        # TODO: Only send upgrade headers on first request
+        self._add_upgrade_headers(headers)
 
         # We may need extra headers.
         if body:
@@ -178,8 +172,8 @@ def get_response(self):
 
         self._sock.advance_buffer(response.consumed)
 
-        if(response.status == 101 and 
-           b'upgrade' in headers['connection'] and bytes(H2C_PROTOCOL, 'utf-8') in headers['upgrade']):
+        if (response.status == 101 and 
+           b'upgrade' in headers['connection'] and H2C_PROTOCOL.decode('utf-8') in headers['upgrade']):
             raise HTTPUpgrade(H2C_PROTOCOL, self._sock)
 
         return HTTP11Response(
@@ -233,6 +227,16 @@ def _add_body_headers(self, headers, body):
         headers[b'transfer-encoding'] = b'chunked'
         return BODY_CHUNKED
 
+    def _add_upgrade_headers(self, headers):
+        # Add HTTP Upgrade headers.
+        headers[b'connection'] = b'Upgrade, HTTP2-Settings'
+        headers[b'upgrade'] = H2C_PROTOCOL
+        
+        # Encode SETTINGS frame payload in Base64 and put into the HTTP-2 Settings header.
+        http2_settings = SettingsFrame(0)
+        http2_settings.settings[SettingsFrame.INITIAL_WINDOW_SIZE] = 65535
+        headers[b'HTTP2-Settings'] = base64.b64encode(http2_settings.serialize_body())
+
     def _send_body(self, body, body_type):
         """
         Handles the HTTP/1.1 logic for sending HTTP bodies. This does magical

hyper/http20/connection.py

@@ -227,7 +227,7 @@ def connect(self):
                 proto = H2C_PROTOCOL
 
             log.debug("Selected NPN protocol: %s", proto)
-            assert proto in (H2_NPN_PROTOCOLS, H2C_PROTOCOL)
+            assert proto in H2_NPN_PROTOCOLS or proto == H2C_PROTOCOL
 
             self._sock = BufferedSocket(sock, self.network_buffer_size)