Merge branch 'master' into format_examples

Author: pgjones

.travis.yml

@@ -7,11 +7,10 @@ python:
   - pypy
   - pypy3
   - 2.7
-  - 3.4
   - 3.5
   - 3.6
   - 3.7
-  - 3.8-dev
+  - 3.8
 
 before_install:
   - pip install -U pip setuptools wheel

README.rst

@@ -112,7 +112,7 @@ library.
 It has a test suite with 100.0% coverage for both statements and
 branches.
 
-Currently it supports Python 3 (testing on 3.4-3.7), Python 2.7, and PyPy.
+Currently it supports Python 3 (testing on 3.5-3.8), Python 2.7, and PyPy.
 (Originally it had a Cython wrapper for `http-parser
 <https://github.com/nodejs/http-parser>`_ and a beautiful nested state
 machine implemented with ``yield from`` to postprocess the output. But

docs/source/basic-usage.rst

@@ -238,8 +238,8 @@ And then we can send requests:
    client = MyHttpClient("httpbin.org", 443)
 
    client.send(h11.Request(method="GET", target="/xml",
-                           headers=[("Host", "httpbin.org")]),
-               h11.EndOfMessage())
+                           headers=[("Host", "httpbin.org")]))
+   client.send(h11.EndOfMessage())
 
 And read back the events:
 
@@ -321,8 +321,8 @@ allowing us to send another :class:`Request`:
    client.conn.our_state, client.conn.their_state
 
    client.send(h11.Request(method="GET", target="/get",
-                           headers=[("Host", "httpbin.org")]),
-               h11.EndOfMessage())
+                           headers=[("Host", "httpbin.org")]))
+   client.send(h11.EndOfMessage())
    client.next_event()
 
 
@@ -339,9 +339,9 @@ Here's some ideas of things you might try:
 
      client.send(h11.Request(method="POST", target="/post",
                              headers=[("Host", "httpbin.org"),
-                                      ("Content-Length", "10")]),
-                 h11.Data(data=b"1234567890"),
-                 h11.EndOfMessage())
+                                      ("Content-Length", "10")]))
+     client.send(h11.Data(data=b"1234567890"))
+     client.send(h11.EndOfMessage())
 
 * Experiment with what happens if you try to violate the HTTP protocol
   by sending a :class:`Response` as a client, or sending two

docs/source/index.rst

@@ -44,7 +44,7 @@ whatever. But h11 makes it much easier to implement something like
 Vital statistics
 ----------------
 
-* Requirements: Python 2.7 or Python 3.4+ (PyPy works great)
+* Requirements: Python 2.7 or Python 3.5+ (PyPy works great)
 
 * Install: ``pip install h11``
 

h11/_readers.py

@@ -58,7 +58,7 @@ def _decode_header_lines(lines):
         # Python 3, validate() takes either and returns matches as bytes. But
         # on Python 2, validate can return matches as bytearrays, so we have
         # to explicitly cast back.
-        matches = validate(header_field_re, bytes(line))
+        matches = validate(header_field_re, bytes(line), "illegal header line: {!r}", bytes(line))
         yield (matches["field_name"], matches["field_value"])
 
 
@@ -71,7 +71,7 @@ def maybe_read_from_IDLE_client(buf):
         return None
     if not lines:
         raise LocalProtocolError("no request line received")
-    matches = validate(request_line_re, lines[0])
+    matches = validate(request_line_re, lines[0], "illegal request line: {!r}", lines[0])
     return Request(
         headers=list(_decode_header_lines(lines[1:])), _parsed=True, **matches
     )
@@ -86,7 +86,7 @@ def maybe_read_from_SEND_RESPONSE_server(buf):
         return None
     if not lines:
         raise LocalProtocolError("no response line received")
-    matches = validate(status_line_re, lines[0])
+    matches = validate(status_line_re, lines[0], "illegal status line: {!r}", lines[0])
     # Tolerate missing reason phrases
     if matches["reason"] is None:
         matches["reason"] = b""
@@ -152,7 +152,7 @@ def __call__(self, buf):
             chunk_header = buf.maybe_extract_until_next(b"\r\n")
             if chunk_header is None:
                 return None
-            matches = validate(chunk_header_re, chunk_header)
+            matches = validate(chunk_header_re, chunk_header, "illegal chunk header: {!r}", chunk_header)
             # XX FIXME: we discard chunk extensions. Does anyone care?
             # We convert to bytes because Python 2's `int()` function doesn't
             # work properly on bytearray objects.

setup.py

@@ -26,10 +26,10 @@
         "Programming Language :: Python :: 2",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Topic :: Internet :: WWW/HTTP",
         "Topic :: System :: Networking",
     ],

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = format, py27, py33, py34, py35, pypy
+envlist = format, py27, py35, py36, py37, py38, pypy
 
 [testenv]
 deps= -r{toxinidir}/test-requirements.txt