Make reprs more accurate

Author: pganssle

Lib/test/support/_hypothesis_stubs/_helpers.py

@@ -4,21 +4,28 @@ def __init__(self, *args, **kwargs):
         super().__init__()
         self.__stub_args = args
         self.__stub_kwargs = kwargs
+        self.__repr = None
+
+    def _with_repr(self, new_repr):
+        new_obj = self.__class__(*self.__stub_args, **self.__stub_kwargs)
+        new_obj.__repr = new_repr
+        return new_obj
 
     def __repr__(self):
+        if self.__repr is not None:
+            return self.__repr
+
         argstr = ", ".join(self.__stub_args)
-        kwargstr = ", ".join(
-            f"{kw}={val}" for kw, val in self.__stub_kwargs.items()
-        )
+        kwargstr = ", ".join(f"{kw}={val}" for kw, val in self.__stub_kwargs.items())
 
         in_parens = argstr
         if kwargstr:
             in_parens += ", " + kwargstr
 
-        return f"{self.__qualname__}({in_parens})"
+        return f"{self.__class__.__qualname__}({in_parens})"
 
 
-def stub_factory(klass, name, _seen={}):
+def stub_factory(klass, name, *, with_repr=None, _seen={}):
     if (klass, name) not in _seen:
 
         class Stub(klass):
@@ -29,6 +36,9 @@ def __init__(self, *args, **kwargs):
 
         Stub.__name__ = name
         Stub.__qualname__ = name
-        _seen.setdefault((klass, name), Stub)
+        if with_repr is not None:
+            Stub._repr = None
+
+        _seen.setdefault((klass, name, with_repr), Stub)
 
-    return _seen[(klass, name)]
+    return _seen[(klass, name, with_repr)]

Lib/test/support/_hypothesis_stubs/strategies.py

@@ -4,17 +4,22 @@
 
 
 class StubStrategy(StubClass):
+    def __make_trailing_repr(self, transformation_name, func):
+        func_name = func.__name__ or repr(func)
+        return f"{self!r}.{transformation_name}({func_name})"
+
     def map(self, pack):
-        return self
+        return self._with_repr(self.__make_trailing_repr("map", pack))
 
     def flatmap(self, expand):
-        return self
+        return self._with_repr(self.__make_trailing_repr("flatmap", expand))
 
     def filter(self, condition):
-        return self
+        return self._with_repr(self.__make_trailing_repr("filter", condition))
 
     def __or__(self, other):
-        return self
+        new_repr = f"one_of({self!r}, {other!r})"
+        return self._with_repr(new_repr)
 
 
 _STRATEGIES = {
@@ -37,7 +42,8 @@ def __or__(self, other):
     "from_regex",
     "from_type",
     "frozensets",
-    "functions" "integers",
+    "functions",
+    "integers",
     "iterables",
     "just",
     "lists",