cffi version works with python-hyper/brotlicffi#214

Author: bdraco

CHANGES/11898.breaking.rst

@@ -1 +1 @@
-Support for ``brotlicffi`` has been removed until the required features are supported by that library -- by :user:`Dreamsorcerer`.
+``Brotli`` and ``brotlicffi`` minimum version is now 1.2 -- by :user:`Dreamsorcerer`.

aiohttp/compression_utils.py

@@ -13,11 +13,10 @@
     Buffer = Union[bytes, bytearray, "memoryview[int]", "memoryview[bytes]"]
 
 try:
-    # brotlicffi won't work until they create a 1.2 release.
-    # try:
-    #    import brotlicffi as brotli
-    # except ImportError:
-    import brotli
+    try:
+        import brotlicffi as brotli
+    except ImportError:
+        import brotli
 
     HAS_BROTLI = True
 except ImportError:

pyproject.toml

@@ -50,7 +50,7 @@ dynamic = [
 speedups = [
   "aiodns >= 3.3.0",
   "Brotli >= 1.2; platform_python_implementation == 'CPython'",
-  #"brotlicffi; platform_python_implementation != 'CPython'",
+  "brotlicffi >= 1.2; platform_python_implementation != 'CPython'",
   "backports.zstd; platform_python_implementation == 'CPython' and python_version < '3.14'",
 ]
 

requirements/runtime-deps.in

@@ -6,6 +6,7 @@ aiosignal >= 1.4.0
 async-timeout >= 4.0, < 6.0 ; python_version < '3.11'
 backports.zstd; platform_python_implementation == 'CPython' and python_version < '3.14'
 Brotli >= 1.2; platform_python_implementation == 'CPython'
+brotlicffi >= 1.2; platform_python_implementation != 'CPython'
 frozenlist >= 1.1.1
 multidict >=4.5, < 7.0
 propcache >= 0.2.0

tests/test_http_parser.py

@@ -30,10 +30,10 @@
 from aiohttp.http_writer import HttpVersion
 
 try:
-    # try:
-    #    import brotlicffi as brotli
-    # except ImportError:
-    import brotli
+    try:
+        import brotlicffi as brotli
+    except ImportError:
+        import brotli
 except ImportError:
     brotli = None
 

tests/test_web_functional.py

@@ -8,10 +8,10 @@
 from typing import NoReturn
 from unittest import mock
 
-# try:
-#    import brotlicffi as brotli
-# except ImportError:
-import brotli
+try:
+    import brotlicffi as brotli
+except ImportError:
+    import brotli
 import pytest
 from multidict import CIMultiDictProxy, MultiDict
 from pytest_mock import MockerFixture

tests/test_web_sendfile_functional.py

@@ -7,10 +7,10 @@
 from typing import NoReturn, Protocol
 from unittest import mock
 
-# try:
-#    import brotlicffi as brotli
-# except ImportError:
-import brotli
+try:
+    import brotlicffi as brotli
+except ImportError:
+    import brotli
 import pytest
 from _pytest.fixtures import SubRequest