lint and flatmap

Author: jobh

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

@@ -83,7 +83,6 @@
 from hypothesis.internal.conjecture.data import ConjectureData
 from hypothesis.internal.conjecture.utils import (
     calc_label_from_callable,
-    calc_label_from_cls,
     calc_label_from_hash,
     check_sample,
     combine_labels,
@@ -1061,7 +1060,7 @@ def calc_label(self) -> int:
             self.class_label,
             calc_label_from_callable(self.target),
             *[strat.label for strat in self.args],
-            *[calc_label_from_hash(k) for k in self.kwargs.keys()],
+            *[calc_label_from_hash(k) for k in self.kwargs],
             *[strat.label for strat in self.kwargs.values()],
         )
 

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

@@ -11,6 +11,7 @@
 from typing import Callable, Generic, TypeVar
 
 from hypothesis.internal.conjecture.data import ConjectureData
+from hypothesis.internal.conjecture.utils import calc_label_from_callable, combine_labels
 from hypothesis.internal.reflection import get_pretty_function_description
 from hypothesis.strategies._internal.strategies import (
     RecurT,
@@ -35,6 +36,13 @@ def __init__(
     def calc_is_empty(self, recur: RecurT) -> bool:
         return recur(self.base)
 
+    def calc_label(self) -> int:
+        return combine_labels(
+            self.class_label,
+            self.base.label,
+            calc_label_from_callable(self.expand),
+        )
+
     def __repr__(self) -> str:
         if not hasattr(self, "_cached_repr"):
             self._cached_repr = (

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

@@ -15,8 +15,8 @@
 
 from hypothesis.control import reject
 from hypothesis.errors import InvalidArgument
-from hypothesis.internal.conjecture.utils import calc_label_from_hash, combine_labels
 from hypothesis.internal.conjecture.data import ConjectureData
+from hypothesis.internal.conjecture.utils import calc_label_from_hash, combine_labels
 from hypothesis.internal.filtering import (
     get_float_predicate_bounds,
     get_integer_predicate_bounds,