update for review

Author: tybug

hypothesis-python/RELEASE.rst

@@ -1,3 +1,3 @@
 RELEASE_TYPE: patch
 
-This patch adds more type hints to our source code, including improving the typing of :func:`~hypothesis.strategies.characters`.
+This patch adds more type hints to internal Hypothesis code.

hypothesis-python/src/hypothesis/errors.py

@@ -8,7 +8,7 @@
 # v. 2.0. If a copy of the MPL was not distributed with this file, You can
 # obtain one at https://mozilla.org/MPL/2.0/.
 
-from typing import Any, Literal
+from typing import Literal
 
 from hypothesis.internal.compat import ExceptionGroup
 
@@ -232,7 +232,7 @@ class Found(HypothesisException):
 class RewindRecursive(Exception):
     """Signal that the type inference should be rewound due to recursive types. Internal use only."""
 
-    def __init__(self, target: Any) -> None:
+    def __init__(self, target: object) -> None:
         self.target = target
 
 

hypothesis-python/src/hypothesis/extra/numpy.py

@@ -531,7 +531,7 @@ def arrays(
             lambda s: arrays(dtype, s, elements=elements, fill=fill, unique=unique)
         )
     # From here on, we're only dealing with values and it's relatively simple.
-    dtype = np.dtype(dtype)  # type: ignore[arg-type,assignment]
+    dtype = np.dtype(dtype)  # type: ignore[arg-type]
     assert isinstance(dtype, np.dtype)  # help mypy out a bit...
     if elements is None or isinstance(elements, Mapping):
         if dtype.kind in ("m", "M") and "[" not in dtype.str:

hypothesis-python/src/hypothesis/internal/compat.py

@@ -206,14 +206,14 @@ def get_type_hints(thing: object) -> dict[str, Any]:
 # We still use the same trick on Python 3, because Numpy values and other
 # custom __floor__ or __ceil__ methods may convert via floats.
 # See issue #1667, Numpy issue 9068.
-def floor(x: float) -> int:
+def floor(x):
     y = int(x)
     if y != x and x < 0:
         return y - 1
     return y
 
 
-def ceil(x: float) -> int:
+def ceil(x):
     y = int(x)
     if y != x and x > 0:
         return y + 1

hypothesis-python/src/hypothesis/strategies/_internal/core.py

@@ -36,6 +36,7 @@
     Protocol,
     TypeVar,
     Union,
+    cast,
     get_args,
     get_origin,
     overload,
@@ -64,6 +65,7 @@
 from hypothesis.internal.cathetus import cathetus
 from hypothesis.internal.charmap import (
     Categories,
+    CategoryName,
     as_general_categories,
     categories as all_categories,
 )
@@ -566,13 +568,13 @@ def characters(
     codec: Optional[str] = None,
     min_codepoint: Optional[int] = None,
     max_codepoint: Optional[int] = None,
-    categories: Optional[Categories] = None,
-    exclude_categories: Optional[Categories] = None,
+    categories: Optional[Collection[CategoryName]] = None,
+    exclude_categories: Optional[Collection[CategoryName]] = None,
     exclude_characters: Optional[Collection[str]] = None,
     include_characters: Optional[Collection[str]] = None,
     # Note: these arguments are deprecated aliases for backwards compatibility
-    blacklist_categories: Optional[Categories] = None,
-    whitelist_categories: Optional[Categories] = None,
+    blacklist_categories: Optional[Collection[CategoryName]] = None,
+    whitelist_categories: Optional[Collection[CategoryName]] = None,
     blacklist_characters: Optional[Collection[str]] = None,
     whitelist_characters: Optional[Collection[str]] = None,
 ) -> SearchStrategy[str]:
@@ -627,7 +629,7 @@ def characters(
     check_valid_size(min_codepoint, "min_codepoint")
     check_valid_size(max_codepoint, "max_codepoint")
     check_valid_interval(min_codepoint, max_codepoint, "min_codepoint", "max_codepoint")
-
+    categories = cast(Optional[Categories], categories)
     if categories is not None and exclude_categories is not None:
         raise InvalidArgument(
             f"Pass at most one of {categories=} and {exclude_categories=} - "

whole_repo_tests/test_mypy.py

@@ -338,7 +338,6 @@ def test_stateful_target_params_mutually_exclusive(tmp_path, decorator):
     "target_args",
     [
         "target=b1",
-        "targets=(b1,)",
         # FIXME: temporary workaround for mypy bug, see hypothesis/pull/4136
         pytest.param("targets=(b1,)", marks=pytest.mark.xfail(strict=False)),
         "targets=(b1, b2)",