Merge branch 'master' into fix/ordinary-connect-no-path

Author: Kriechi

.github/workflows/ci.yml

@@ -18,7 +18,7 @@ jobs:
  - "3.12"
  - "3.13"
  - "3.14"
- - "pypy3.9"
+ - "pypy3.11"
 
  steps:
  - uses: actions/checkout@v2

CHANGELOG.rst

@@ -7,16 +7,17 @@ dev
 **API Changes (Backward Incompatible)**
 
 - Support for Python 3.9 has been removed.
+- Support for PyPy 3.9 has been removed.
 
 **API Changes (Backward Compatible)**
 
 - Support for Python 3.14 has been added.
+- Support for PyPy 3.11 has been added.
 - Align CONNECT pseudo-header validation with RFC 9113 s8.3 and RFC 8441 s4.
  Ordinary CONNECT now requires ``:method=CONNECT`` and ``:authority``, and
  forbids ``:scheme``/``:path``. Extended CONNECT (e.g., WebSocket) requires
  ``:scheme``, ``:path``, ``:authority`` plus ``:protocol``. (PR #1309)
 
-
 **Bugfixes**
 
 -

pyproject.toml

@@ -2,14 +2,16 @@
 # https://packaging.python.org/en/latest/specifications/pyproject-toml/
 
 [build-system]
-requires = ["setuptools"]
+requires = ["setuptools>=77"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "h2"
 description = "Pure-Python HTTP/2 protocol implementation"
 readme = { file = "README.rst", content-type = "text/x-rst" }
-license = { file = "LICENSE" }
+
+license = "MIT"
+license-files = [ "LICENSE" ]
 
 authors = [
  { name = "Cory Benfield", email = "cory@lukasa.co.uk" }
@@ -29,7 +31,6 @@ dynamic = ["version"]
 classifiers = [
  "Development Status :: 5 - Production/Stable",
  "Intended Audience :: Developers",
- "License :: OSI Approved :: MIT License",
  "Programming Language :: Python",
  "Programming Language :: Python :: 3 :: Only",
  "Programming Language :: Python :: 3",
@@ -72,9 +73,9 @@ linting = [
 packaging = [
  "check-manifest==0.50",
  "readme-renderer==44.0",
- "build>=1.2.2,<2",
- "twine>=6.1.0,<7",
- "wheel>=0.45.0,<1",
+ "build>=1.3.0,<2",
+ "twine>=6.2.0,<7",
+ "wheel>=0.45.1,<1",
 ]
 
 docs = [
@@ -132,7 +133,6 @@ lint.ignore = [
  "TD002", # readability
  "TD003", # readability
  "S101", # readability
- "PD901", # readability
  "ERA001", # readability
  "ARG001", # readability
  "ARG002", # readability
@@ -170,7 +170,7 @@ source = [
 
 [tool.tox]
 min_version = "4.23.2"
-env_list = [ "py310", "py311", "py312", "py313", "py314", "pypy3", "lint", "docs", "packaging" ]
+env_list = [ "py310", "py311", "py312", "py313", "py314", "pypy311", "lint", "docs", "packaging" ]
 
 [tool.tox.gh-actions]
 python = """
@@ -179,7 +179,7 @@ python = """
  3.12: py312
  3.13: py313
  3.14: py314
- pypy3: pypy3
+ pypy3.11: pypy311
 """
 
 [tool.tox.env_run_base]
@@ -188,12 +188,6 @@ commands = [
  ["python", "-bb", "-m", "pytest", "--cov-report=xml", "--cov-report=term", "--cov=h2", { replace = "posargs", extend = true }]
 ]
 
-[tool.tox.env.pypy3]
-# temporarily disable coverage testing on PyPy due to performance problems
-commands = [
- ["pytest", { replace = "posargs", extend = true }]
-]
-
 [tool.tox.env.lint]
 dependency_groups = ["linting"]
 commands = [

src/h2/connection.py

@@ -8,7 +8,7 @@
 
 import base64
 from enum import Enum, IntEnum
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
 
 from hpack.exceptions import HPACKError, OversizedHeaderListError
 from hpack.hpack import Decoder, Encoder
@@ -66,7 +66,7 @@
 from .windows import WindowManager
 
 if TYPE_CHECKING: # pragma: no cover
- from collections.abc import Iterable
+ from collections.abc import Callable, Iterable
 
  from hpack.struct import Header, HeaderWeaklyTyped
 

src/h2/events.py

@@ -11,7 +11,6 @@
 from __future__ import annotations
 
 import binascii
-import sys
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any
 
@@ -24,10 +23,7 @@
  from .errors import ErrorCodes
 
 
-if sys.version_info < (3, 10): # pragma: no cover
- kw_only: dict[str, bool] = {}
-else: # pragma: no cover
- kw_only = {"kw_only": True}
+kw_only = {"kw_only": True}
 
 
 _LAZY_INIT: Any = object()

src/h2/settings.py

@@ -11,7 +11,6 @@
 import collections
 import enum
 from collections.abc import Iterator, MutableMapping
-from typing import Union
 
 from hyperframe.frame import SettingsFrame
 
@@ -90,7 +89,7 @@ def __repr__(self) -> str:
  )
 
 
-class Settings(MutableMapping[Union[SettingCodes, int], int]): # noqa: PLW1641
+class Settings(MutableMapping[SettingCodes | int, int]):
  """
  An object that encapsulates HTTP/2 settings state.
 
@@ -307,6 +306,10 @@ def __ne__(self, other: object) -> bool:
  return not self == other
  return NotImplemented
 
+ # be explicit that Settings is not providing a hash implementation
+ # see https://docs.python.org/3/reference/datamodel.html#object.__hash__
+ __hash__ = MutableMapping.__hash__
+
 
 def _validate_setting(setting: SettingCodes | int, value: int) -> ErrorCodes:
  """

src/h2/stream.py

@@ -7,7 +7,7 @@
 from __future__ import annotations
 
 from enum import Enum, IntEnum
-from typing import TYPE_CHECKING, Any, Union, cast
+from typing import TYPE_CHECKING, Any, cast
 
 from hpack import HeaderTuple
 from hyperframe.frame import AltSvcFrame, ContinuationFrame, DataFrame, Frame, HeadersFrame, PushPromiseFrame, RstStreamFrame, WindowUpdateFrame
@@ -968,7 +968,10 @@ def send_data(self,
  self.state_machine.process_input(StreamInputs.SEND_DATA)
 
  df = DataFrame(self.stream_id)
- df.data = data.tobytes() if isinstance(data, memoryview) else data
+ if isinstance(data, memoryview):
+ df.data = data.tobytes()
+ else:
+ df.data = data
  if end_stream:
  self.state_machine.process_input(StreamInputs.SEND_END_STREAM)
  df.flags.add("END_STREAM")
@@ -1076,7 +1079,7 @@ def receive_headers(self,
 
  events = self.state_machine.process_input(input_)
  headers_event = cast(
- "Union[RequestReceived, ResponseReceived, TrailersReceived, InformationalResponseReceived]",
+ "RequestReceived | ResponseReceived | TrailersReceived | InformationalResponseReceived",
  events[0],
  )
 
@@ -1086,7 +1089,7 @@ def receive_headers(self,
  )
  # We ensured it's not an information response at the beginning of the method.
  cast(
- "Union[RequestReceived, ResponseReceived, TrailersReceived]",
+ "RequestReceived | ResponseReceived | TrailersReceived",
  headers_event,
  ).stream_ended = cast("StreamEnded", es_events[0])
  events += es_events