Comply with new h11

pyproject.toml

@@ -30,7 +30,7 @@ classifiers = [
 ]
 dependencies = [
     "click>=7.0",
-    "h11>=0.8",
+    "h11 @ git+https://github.com/pgjones/h11.git@master",
     "typing-extensions;python_version < '3.8'",
 ]
 
@@ -61,3 +61,6 @@ path = "uvicorn/__init__.py"
 include = [
     "/uvicorn",
 ]
+
+[tool.hatch.metadata]
+allow-direct-references = true

requirements.txt

@@ -26,6 +26,7 @@ cryptography==38.0.1
 coverage==6.5.0
 coverage-conditional-plugin==0.7.0
 httpx==0.23.0
+httpcore @ git+https://github.com/encode/httpcore.git
 watchgod==0.8.2
 
 # Documentation

scripts/check

@@ -11,6 +11,6 @@ set -x
 ./scripts/sync-version
 ${PREFIX}black --check --diff --target-version=py37 $SOURCE_FILES
 ${PREFIX}flake8 $SOURCE_FILES
-${PREFIX}mypy --show-error-codes
+${PREFIX}mypy
 ${PREFIX}isort --check --diff --project=uvicorn $SOURCE_FILES
 ${PREFIX}python -m tools.cli_usage --check

setup.cfg

@@ -6,6 +6,7 @@ max-line-length = 88
 disallow_untyped_defs = True
 ignore_missing_imports = True
 follow_imports = silent
+show_error_codes = True
 files =
     uvicorn/lifespan,
     uvicorn/config.py,

uvicorn/protocols/http/h11_impl.py

@@ -193,10 +193,10 @@ def handle_events(self) -> None:
                 return
             event_type = type(event)
 
-            if event_type is h11.NEED_DATA:
+            if event is h11.NEED_DATA:
                 break
 
-            elif event_type is h11.PAUSED:
+            elif event is h11.PAUSED:
                 # This case can occur in HTTP pipelining, so we need to
                 # stop reading any more data, and ensure that at the end
                 # of the active request/response cycle we handle any
@@ -205,6 +205,7 @@ def handle_events(self) -> None:
                 break
 
             elif event_type is h11.Request:
+                event = cast(h11.Request, event)
                 self.headers = [(key.lower(), value) for key, value in event.headers]
                 raw_path, _, query_string = event.target.partition(b"?")
                 self.scope = {  # type: ignore[typeddict-item]
@@ -258,6 +259,7 @@ def handle_events(self) -> None:
                 self.tasks.add(task)
 
             elif event_type is h11.Data:
+                event = cast(h11.Data, event)
                 if self.conn.our_state is h11.DONE:
                     continue
                 self.cycle.body += event.data
@@ -266,14 +268,15 @@ def handle_events(self) -> None:
                 self.cycle.message_event.set()
 
             elif event_type is h11.EndOfMessage:
+                event = cast(h11.EndOfMessage, event)
                 if self.conn.our_state is h11.DONE:
                     self.transport.resume_reading()
                     self.conn.start_next_cycle()
                     continue
                 self.cycle.more_body = False
                 self.cycle.message_event.set()
 
-    def handle_websocket_upgrade(self, event: H11Event) -> None:
+    def handle_websocket_upgrade(self, event: h11.Request) -> None:
         if self.logger.level <= TRACE_LOG_LEVEL:
             prefix = "%s:%d - " % self.client if self.client else ""
             self.logger.log(TRACE_LOG_LEVEL, "%sUpgrading to WebSocket", prefix)
@@ -300,11 +303,9 @@ def send_400_response(self, msg: str) -> None:
         event = h11.Response(status_code=400, headers=headers, reason=reason)
         output = self.conn.send(event)
         self.transport.write(output)
-        event = h11.Data(data=msg.encode("ascii"))
-        output = self.conn.send(event)
+        output = self.conn.send(h11.Data(data=msg.encode("ascii")))
         self.transport.write(output)
-        event = h11.EndOfMessage()
-        output = self.conn.send(event)
+        output = self.conn.send(h11.EndOfMessage())
         self.transport.write(output)
         self.transport.close()
 
@@ -506,18 +507,17 @@ async def send(self, message: "ASGISendEvent") -> None:
 
             # Write response body
             if self.scope["method"] == "HEAD":
-                event = h11.Data(data=b"")
+                data = b""
             else:
-                event = h11.Data(data=body)
-            output = self.conn.send(event)
+                data = body
+            output = self.conn.send(h11.Data(data=data))
             self.transport.write(output)
 
             # Handle response completion
             if not more_body:
                 self.response_complete = True
                 self.message_event.set()
-                event = h11.EndOfMessage()
-                output = self.conn.send(event)
+                output = self.conn.send(h11.EndOfMessage())
                 self.transport.write(output)
 
         else:
@@ -527,15 +527,14 @@ async def send(self, message: "ASGISendEvent") -> None:
 
         if self.response_complete:
             if self.conn.our_state is h11.MUST_CLOSE or not self.keep_alive:
-                event = h11.ConnectionClosed()
-                self.conn.send(event)
+                self.conn.send(h11.ConnectionClosed())
                 self.transport.close()
             self.on_response()
 
     async def receive(self) -> "ASGIReceiveEvent":
         if self.waiting_for_100_continue and not self.transport.is_closing():
             event = h11.InformationalResponse(
-                status_code=100, headers=[], reason="Continue"
+                status_code=100, headers=[], reason="Continue"  # type: ignore[arg-type]
             )
             output = self.conn.send(event)
             self.transport.write(output)