update changes as suggested

Author: ash01ish

requirements/ci-3.11.txt

@@ -4,6 +4,8 @@
 #
 #    pip-compile --output-file=requirements/ci-3.11.txt requirements/ci.in
 #
+brotli==1.1.0
+    # via -r requirements/ci.in
 cffi==1.17.1
     # via cryptography
 coverage[toml]==7.6.4
@@ -75,5 +77,3 @@ typing-extensions==4.12.2
     # via
     #   mypy
     #   typeguard
-brotli==1.1.0
-    # via -r requirements/ci.in

requirements/ci.txt

@@ -4,6 +4,8 @@
 #
 #    pip-compile requirements/ci.in
 #
+brotli==1.1.0
+    # via -r requirements/ci.in
 cffi==1.17.1
     # via cryptography
 coverage[toml]==7.6.1
@@ -77,5 +79,3 @@ typing-extensions==4.12.2
     #   typeguard
 zipp==3.20.2
     # via importlib-metadata
-brotli==1.1.0
-    # via -r requirements/ci.in

requirements/dev.txt

@@ -4,6 +4,8 @@
 #
 #    pip-compile requirements/dev.in
 #
+brotli==1.1.0
+    # via -r requirements/ci.in
 build==1.2.2.post1
     # via pip-tools
 certifi==2024.8.30
@@ -86,5 +88,3 @@ zipp==3.20.2
 # The following packages are considered to be unsafe in a requirements file:
 # pip
 # setuptools
-brotli==1.1.0
-    # via -r requirements/ci.in

tests/test_filters.py

@@ -68,9 +68,8 @@ def test_brotli_decode_encode(s):
     assert decoded == s_bytes
 
 
-
 @patch("pypdf.filters.brotli", None)
-def test_brotli_missing_installation_mocked():
+def test_brotli_missing_installation():
     """Verify BrotliDecode raises ImportError if brotli is not installed."""
     from pypdf.filters import BrotliDecode, decode_stream_data
 
@@ -93,20 +92,24 @@ def test_brotli_missing_installation_mocked():
         decode_stream_data(stream)
     assert "Brotli library not installed" in str(exc_info_stream.value)
 
-def test_brotli_import_handling():
-    """Verify the try-except block for brotli import in pypdf.filters."""
-    # Simulate brotli import failure
-    if "brotli" in sys.modules:
-        del sys.modules["brotli"]
-    with patch.dict(sys.modules, {"brotli": None}):
-        import pypdf.filters
-        importlib.reload(pypdf.filters)  # Re-evaluate module-level try-except
-    assert pypdf.filters.brotli is None, "brotli should be None when import fails"
-
-    # Test successful import if brotli is installed
-    if importlib.util.find_spec("brotli"):
-        importlib.reload(pypdf.filters)  # Re-evaluate with brotli available
-        assert pypdf.filters.brotli is not None, "brotli should be imported when available"
+
+@patch("importlib.util.find_spec", return_value=None)
+def test_brotli_import_handling_not_available():
+    """Verify the brotli=None assignment in pypdf.filters when brotli is not available."""
+    # Re-import the module with patched find_spec to simulate missing brotli
+    with patch.dict("sys.modules", {}, clear=False):
+        if "pypdf.filters" in sys.modules:
+            del sys.modules["pypdf.filters"]
+        from pypdf import filters
+        assert filters.brotli is None, "brotli should be None when import fails"
+
+@pytest.mark.skipif(importlib.util.find_spec("brotli") is None, reason="brotli library not installed")
+def test_brotli_import_handling_available():
+    """Verify brotli module is properly imported in pypdf.filters when available."""
+    # This test only runs when brotli is actually installed
+    from pypdf import filters
+    assert filters.brotli is not None, "brotli should be imported when available"
+
 
 def test_flatedecode_unsupported_predictor():
     """
@@ -751,14 +754,10 @@ def test_main_decode_brotli_installed():
     if importlib.util.find_spec("brotli") is None:
         pytest.skip("brotli library not installed")
 
-    # Use the test PDF generated by resources/create_brotli_test_pdf.py
     pdf_path = RESOURCE_ROOT / "brotli-test-pdfs" / "minimal-brotli-compressed.pdf"
 
     reader = PdfReader(pdf_path)
     page = reader.pages[0]
-
-    # Extract text - this will implicitly use the BrotliDecode filter
     extracted_text = page.extract_text()
 
-    # Verify the expected text content
     assert extracted_text.strip() == "Hello, Brotli!"