Merge branch 'development' of github.com:Lukasa/hyper into concurrency

- syncs the concurrency branch with development branch
- modifies the concurrency implementation to reflect the use of hyper-h

Author: Tim Emiola

.coveragerc

@@ -1,6 +1,17 @@
 [run]
+source = hyper
 omit =
     hyper/compat.py
     hyper/httplib_compat.py
     hyper/ssl_compat.py
     hyper/packages/*
+
+[report]
+fail_under = 100
+show_missing = True
+
+[paths]
+source =
+    hyper/
+    .tox/*/lib/python*/site-packages/hyper
+    .tox/pypy*/site-packages/hyper

.travis.yml

@@ -2,8 +2,8 @@ language: python
 
 python:
   - "2.7"
-  - "3.3"
   - "3.4"
+  - "3.5"
   - pypy
 
 env:
@@ -23,6 +23,8 @@ matrix:
 
 install:
   - ".travis/install.sh"
+before_script: "flake8 --max-complexity 15 --exclude 'hyper/packages/*' hyper test"
+
 script:
   - >
       if [[ "$TEST_RELEASE" == true ]]; then
@@ -31,7 +33,8 @@ script:
         if [[ $TRAVIS_PYTHON_VERSION == pypy ]]; then
           py.test test/
         else
-          py.test -n 4 --cov hyper test/
-          coverage report -m --fail-under 100
+          coverage run -m py.test test/
+          coverage combine
+          coverage report
         fi
       fi

.travis/install.sh

@@ -48,3 +48,4 @@ fi
 
 pip install .
 pip install -r test_requirements.txt
+pip install flake8

HISTORY.rst

@@ -1,6 +1,14 @@
 Release History
 ===============
 
+dev
+---
+
+*Bugfixes*
+
+- Overriding HTTP/2 special headers no longer leads to ill-formed header blocks
+  with special headers at the end.
+
 0.5.0 (2015-10-11)
 ------------------
 

hyper/__init__.py

@@ -6,7 +6,7 @@
 A module for providing an abstraction layer over the differences between
 HTTP/1.1 and HTTP/2.
 """
-__version__ = '0.5.0'
+import logging
 
 from .common.connection import HTTPConnection
 from .http20.connection import HTTP20Connection
@@ -16,8 +16,10 @@
 
 # Throw import errors on Python <2.7 and 3.0-3.2.
 import sys as _sys
-if _sys.version_info < (2,7) or (3,0) <= _sys.version_info < (3,3):
-    raise ImportError("hyper only supports Python 2.7 and Python 3.3 or higher.")
+if _sys.version_info < (2, 7) or (3, 0) <= _sys.version_info < (3, 3):
+    raise ImportError(
+        "hyper only supports Python 2.7 and Python 3.3 or higher."
+    )
 
 __all__ = [
     HTTPConnection,
@@ -29,5 +31,6 @@
 ]
 
 # Set default logging handler.
-import logging
 logging.getLogger(__name__).addHandler(logging.NullHandler())
+
+__version__ = '0.5.0'

hyper/cli.py

@@ -108,26 +108,30 @@ def make_troubleshooting_argument(parser):
         help='Show debugging information (loglevel=DEBUG)')
     parser.add_argument(
         '--h2', action='store_true', default=False,
-        help="Do HTTP/2 directly in plaintext: skip plaintext upgrade")
+        help="Do HTTP/2 directly, skipping plaintext upgrade and ignoring "
+             "NPN/ALPN."
+    )
 
 
-def set_url_info(args):
-    def split_host_and_port(hostname):
-        if ':' in hostname:
-            return to_host_port_tuple(hostname, default_port=443)
-        return hostname, None
-
-    class UrlInfo(object):
-        def __init__(self):
-            self.fragment = None
-            self.host = 'localhost'
-            self.netloc = None
-            self.path = '/'
-            self.port = 443
-            self.query = None
-            self.scheme = 'https'
-            self.secure = False
+def split_host_and_port(hostname):
+    if ':' in hostname:
+        return to_host_port_tuple(hostname, default_port=443)
+    return hostname, None
+
+
+class UrlInfo(object):
+    def __init__(self):
+        self.fragment = None
+        self.host = 'localhost'
+        self.netloc = None
+        self.path = '/'
+        self.port = 443
+        self.query = None
+        self.scheme = 'https'
+        self.secure = False
 
+
+def set_url_info(args):
     info = UrlInfo()
     _result = urlsplit(args._url)
     for attr in vars(info).keys():
@@ -164,7 +168,14 @@ def set_request_data(args):
     body, headers, params = {}, {}, {}
     for i in args.items:
         if i.sep == SEP_HEADERS:
-            headers[i.key] = i.value
+            if i.key:
+                headers[i.key] = i.value
+            else:
+                # when overriding a HTTP/2 special header there will be a
+                # leading colon, which tricks the command line parser into
+                # thinking the header is empty
+                k, v = i.value.split(':', 1)
+                headers[':' + k] = v
         elif i.sep == SEP_QUERY:
             params[i.key] = i.value
         elif i.sep == SEP_DATA:
@@ -227,7 +238,10 @@ def request(args):
         )
     else:  # pragma: no cover
         conn = HTTP20Connection(
-            args.url.host, args.url.port, secure=args.url.secure
+            args.url.host,
+            args.url.port,
+            secure=args.url.secure,
+            force_proto='h2'
         )
 
     conn.request(args.method, args.url.path, args.body, args.headers)

hyper/common/bufsocket.py

@@ -13,6 +13,7 @@
 import select
 from .exceptions import ConnectionResetError, LineTooLongError
 
+
 class BufferedSocket(object):
     """
     A buffered socket wrapper.
@@ -67,9 +68,6 @@ def can_read(self):
         """
         Whether or not there is more data to read from the socket.
         """
-        if self._bytes_in_buffer:
-            return True
-
         read = select.select([self._sck], [], [], 0)[0]
         if read:
             return True
@@ -140,8 +138,7 @@ def recv(self, amt):
         else:
             should_read = True
 
-        if ((self._remaining_capacity > self._bytes_in_buffer) and
-            (should_read)):
+        if (self._remaining_capacity > self._bytes_in_buffer and should_read):
             count = self._sck.recv_into(self._buffer_view[self._buffer_end:])
 
             # The socket just got closed. We should throw an exception if we
@@ -175,7 +172,6 @@ def fill(self):
 
         return
 
-
     def readline(self):
         """
         Read up to a newline from the network and returns it. The implicit

hyper/common/connection.py

@@ -10,6 +10,7 @@
 from ..http20.connection import HTTP20Connection
 from ..tls import H2_NPN_PROTOCOLS, H2C_PROTOCOL
 
+
 class HTTPConnection(object):
     """
     An object representing a single HTTP connection to a server.
@@ -24,26 +25,27 @@ class HTTPConnection(object):
     :param host: The host to connect to. This may be an IP address or a
         hostname, and optionally may include a port: for example,
         ``'http2bin.org'``, ``'http2bin.org:443'`` or ``'127.0.0.1'``.
-    :param port: (optional) The port to connect to. If not provided and one also
-        isn't provided in the ``host`` parameter, defaults to 443.
+    :param port: (optional) The port to connect to. If not provided and one
+        also isn't provided in the ``host`` parameter, defaults to 80.
     :param secure: (optional) Whether the request should use TLS.
         Defaults to ``False`` for most requests, but to ``True`` for any
         request issued to port 443.
     :param window_manager: (optional) The class to use to manage flow control
         windows. This needs to be a subclass of the
-        :class:`BaseFlowControlManager <hyper.http20.window.BaseFlowControlManager>`.
-        If not provided,
+        :class:`BaseFlowControlManager
+        <hyper.http20.window.BaseFlowControlManager>`. If not provided,
         :class:`FlowControlManager <hyper.http20.window.FlowControlManager>`
         will be used.
     :param enable_push: (optional) Whether the server is allowed to push
         resources to the client (see
         :meth:`get_pushes() <hyper.HTTP20Connection.get_pushes>`).
     :param ssl_context: (optional) A class with custom certificate settings.
         If not provided then hyper's default ``SSLContext`` is used instead.
-    :param proxy_host: (optional) The proxy to connect to.  This can be an IP address
-        or a host name and may include a port.
-    :param proxy_port: (optional) The proxy port to connect to. If not provided 
-        and one also isn't provided in the ``proxy`` parameter, defaults to 8080.
+    :param proxy_host: (optional) The proxy to connect to.  This can be an IP
+        address or a host name and may include a port.
+    :param proxy_port: (optional) The proxy port to connect to. If not provided
+        and one also isn't provided in the ``proxy`` parameter, defaults to
+        8080.
     """
     def __init__(self,
                  host,
@@ -59,12 +61,12 @@ def __init__(self,
         self._host = host
         self._port = port
         self._h1_kwargs = {
-            'secure': secure, 'ssl_context': ssl_context, 
-            'proxy_host': proxy_host, 'proxy_port': proxy_port 
+            'secure': secure, 'ssl_context': ssl_context,
+            'proxy_host': proxy_host, 'proxy_port': proxy_port
         }
         self._h2_kwargs = {
             'window_manager': window_manager, 'enable_push': enable_push,
-            'secure': secure, 'ssl_context': ssl_context, 
+            'secure': secure, 'ssl_context': ssl_context,
             'proxy_host': proxy_host, 'proxy_port': proxy_port
         }
 
@@ -76,7 +78,7 @@ def __init__(self,
             self._host, self._port, **self._h1_kwargs
         )
 
-    def request(self, method, url, body=None, headers={}):
+    def request(self, method, url, body=None, headers=None):
         """
         This will send a request to the server using the HTTP request method
         ``method`` and the selector ``url``. If the ``body`` argument is
@@ -93,6 +95,9 @@ def request(self, method, url, body=None, headers={}):
         :returns: A stream ID for the request, or ``None`` if the request is
             made over HTTP/1.1.
         """
+
+        headers = headers or {}
+
         try:
             return self._conn.request(
                 method=method, url=url, body=body, headers=headers

hyper/common/exceptions.py

@@ -5,6 +5,8 @@
 
 Contains hyper's exceptions.
 """
+
+
 class ChunkedDecodeError(Exception):
     """
     An error was encountered while decoding a chunked response.
@@ -43,6 +45,7 @@ class ConnectionResetError(Exception):
         A HTTP connection was unexpectedly reset.
         """
 
+
 class TLSUpgrade(Exception):
     """
     We upgraded to a new protocol in the NPN/ALPN handshake.
@@ -52,6 +55,7 @@ def __init__(self, negotiated, sock):
         self.negotiated = negotiated
         self.sock = sock
 
+
 class HTTPUpgrade(Exception):
     """
     We upgraded to a new protocol via the HTTP Upgrade response.

hyper/common/headers.py

@@ -184,15 +184,28 @@ def iter_raw(self):
     def replace(self, key, value):
         """
         Replace existing header with new value. If header doesn't exist this
-        method work like ``__setitem__``. Replacing leads to deletion of all 
-        exsiting headers with the same name.
+        method work like ``__setitem__``. Replacing leads to deletion of all
+        existing headers with the same name.
         """
-        try:
-            del self[key]
-        except KeyError:
-            pass
+        key, value = to_bytestring_tuple(key, value)
+        indices = []
+        for (i, (k, v)) in enumerate(self._items):
+            if _keys_equal(k, key):
+                indices.append(i)
+
+        # If the key isn't present, this is easy: just append and abort early.
+        if not indices:
+            self._items.append((key, value))
+            return
+
+        # Delete all but the first. I swear, this is the correct slicing
+        # syntax!
+        base_index = indices[0]
+        for i in indices[:0:-1]:
+            self._items.pop(i)
 
-        self[key] = value
+        del self._items[base_index]
+        self._items.insert(base_index, (key, value))
 
     def merge(self, other):
         """