flake8

Author: honnibal

confection/tests/test_config_values.py

@@ -3,16 +3,18 @@
 Uses property-based testing to explore the space of possible config values.
 """
 
+from configparser import ConfigParser, ExtendedInterpolation
+
 import pytest
 import srsly
-from hypothesis import HealthCheck, example, given, settings
+from hypothesis import HealthCheck, given, settings
 from hypothesis import strategies as st
 from numpy.testing import assert_allclose, assert_equal
 from pydantic import ValidationError
 
 from confection import Config
 from confection._config import try_load_json
-from confection._registry import get_func_fields, make_func_schema
+from confection._registry import make_func_schema
 from confection.tests.util import my_registry
 
 # =============================================================================
@@ -92,8 +94,6 @@ def test_invalid_json_returned_as_is(self, inp):
 # =============================================================================
 # These tests define what SHOULD work if we remove the buggy CustomInterpolation
 
-from configparser import ConfigParser, ExtendedInterpolation
-
 
 class TestPlainExtendedInterpolation:
     """Test parsing with plain ExtendedInterpolation (no custom before_read)."""
@@ -127,7 +127,7 @@ def test_unquoted_json_literals(self, ini_value, expected_type, expected_value):
         parser = self._parse(f"[s]\nv = {ini_value}")
         raw = parser.get("s", "v")
         parsed = self._parse_value(raw)
-        assert type(parsed) == expected_type
+        assert type(parsed) is expected_type
         assert parsed == expected_value
 
     # Quoted strings - the key test cases

confection/tests/test_param_processing.py

@@ -6,10 +6,8 @@
 import inspect
 from typing import Any, Generator, Iterable, List, Sequence, Union
 
-import pytest
 from hypothesis import given, settings
 from hypothesis import strategies as st
-from pydantic import Field
 from pydantic.fields import FieldInfo
 
 from confection._registry import (
@@ -264,19 +262,9 @@ def test_union_iterable_after_list_reordered(self):
         result = _reorder_union_for_generators(annotation)
         args = result.__args__
 
-        # Iterable should come before List
-        iterable_idx = None
-        list_idx = None
-        for i, arg in enumerate(args):
-            if arg is Iterable or (
-                hasattr(arg, "__origin__") and arg.__origin__ is Iterable
-            ):
-                iterable_idx = i
-            if _is_sequence_type(arg):
-                list_idx = i
-
         # Note: Iterable is not an iterator type in our check, so this might not reorder
-        # Let's verify the actual behavior
+        # Let's verify the actual behavior - just check the result is valid
+        assert args is not None
 
 
 # =============================================================================

confection/tests/test_pydantic_generators.py

@@ -3,7 +3,7 @@
 from typing import Generator, Iterable, Iterator, List, Union
 
 import pytest
-from pydantic import BaseModel, Field, create_model
+from pydantic import create_model
 
 
 def make_generator():
@@ -39,7 +39,6 @@ def test_iterator_annotation_not_supported(self):
         """Iterator annotation alone - NOT SUPPORTED by Pydantic without arbitrary_types_allowed."""
         import pydantic
 
-        gen = make_generator()
         with pytest.raises(pydantic.errors.PydanticSchemaGenerationError):
             create_model("M", field=(Iterator, ...))
 
@@ -78,7 +77,7 @@ def test_union_generator_last(self):
         """Union with Generator listed last - CONSUMED (List tried first)."""
         gen = make_generator()
         Model = create_model("M", field=(Union[float, List[float], Generator], ...))
-        result = Model.model_validate({"field": gen})
+        Model.model_validate({"field": gen})
         # Generator is consumed because List[float] is tried first
         assert_consumed(gen)
 
@@ -100,7 +99,7 @@ def test_union_iterable_last(self):
         """Union with Iterable listed last - CONSUMED (List tried first)."""
         gen = make_generator()
         Model = create_model("M", field=(Union[float, List[float], Iterable], ...))
-        result = Model.model_validate({"field": gen})
+        Model.model_validate({"field": gen})
         # Generator is consumed because List[float] is tried first
         assert_consumed(gen)
 
@@ -139,7 +138,7 @@ def test_union_generator_parameterized_last(self):
         Model = create_model(
             "M", field=(Union[float, List[float], Generator[float, None, None]], ...)
         )
-        result = Model.model_validate({"field": gen})
+        Model.model_validate({"field": gen})
         # This FAILS - generator is consumed because List comes first
         assert_consumed(gen)
 
@@ -158,7 +157,7 @@ def test_union_iterable_parameterized_last(self):
         Model = create_model(
             "M", field=(Union[float, List[float], Iterable[float]], ...)
         )
-        result = Model.model_validate({"field": gen})
+        Model.model_validate({"field": gen})
         # This FAILS - generator is consumed because List comes first
         assert_consumed(gen)
 
@@ -186,7 +185,7 @@ def test_generator_after_list_consumed(self):
         """Generator after List[float] - CONSUMED."""
         gen = make_generator()
         Model = create_model("M", field=(Union[float, List[float], Generator], ...))
-        result = Model.model_validate({"field": gen})
+        Model.model_validate({"field": gen})
         assert_consumed(gen)
 
     def test_iterable_before_list_ok(self):
@@ -200,7 +199,7 @@ def test_iterable_after_list_consumed(self):
         """Iterable after List[float] - CONSUMED."""
         gen = make_generator()
         Model = create_model("M", field=(Union[float, List[float], Iterable], ...))
-        result = Model.model_validate({"field": gen})
+        Model.model_validate({"field": gen})
         assert_consumed(gen)