improve st.characters categories repr

Author: tybug

hypothesis-python/RELEASE.rst

@@ -0,0 +1,3 @@
+RELEASE_TYPE: patch
+
+Improve the string representation of |st.characters| in some cases.

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

@@ -75,18 +75,23 @@ def from_characters_args(
         )
         if codec is not None:
             intervals &= charmap.intervals_from_codec(codec)
-        _arg_repr = ", ".join(
-            f"{k}={v!r}"
-            for k, v in [
-                ("codec", codec),
-                ("min_codepoint", min_codepoint),
-                ("max_codepoint", max_codepoint),
-                ("categories", categories),
-                ("exclude_characters", exclude_characters),
-                ("include_characters", include_characters),
-            ]
-            if v not in (None, "", set(charmap.categories()) - {"Cs"})
-        )
+
+        _args = []
+        if codec is not None:
+            _args.append(("codec", codec))
+        if min_codepoint is not None:
+            _args.append(("min_codepoint", min_codepoint))
+        if max_codepoint is not None:
+            _args.append(("max_codepoint", max_codepoint))
+        if categories is not None and set(categories) != set(charmap.categories()) - {
+            "Cs"
+        }:
+            _args.append(("categories", categories))
+        if exclude_characters not in [None, ""]:
+            _args.append(("exclude_characters", exclude_characters))
+        if include_characters not in [None, ""]:
+            _args.append(("include_characters", include_characters))
+        _arg_repr = ", ".join(f"{k}={v!r}" for k, v in _args)
         if not intervals:
             raise InvalidArgument(
                 "No characters are allowed to be generated by this "

hypothesis-python/tests/cover/test_custom_reprs.py

@@ -13,6 +13,7 @@
 import pytest
 
 from hypothesis import given, settings, strategies as st
+from hypothesis.strategies._internal.lazy import unwrap_strategies
 
 
 def test_includes_non_default_args_in_repr():
@@ -165,3 +166,33 @@ def inner(a, b):
 )
 """
     assert "\n".join(err.value.__notes__).strip() == expected.strip()
+
+
+@pytest.mark.parametrize(
+    "strategy, expected_repr",
+    [
+        (st.characters(), "characters()"),
+        (st.characters(codec="utf-8"), "characters(codec='utf-8')"),
+        (st.characters(min_codepoint=65), "characters(min_codepoint=65)"),
+        (st.characters(max_codepoint=127), "characters(max_codepoint=127)"),
+        (st.characters(categories=["Lu", "Ll"]), "characters(categories=('Lu', 'Ll'))"),
+        (
+            st.characters(exclude_characters="abc"),
+            "characters(exclude_characters='abc')",
+        ),
+        (
+            st.characters(min_codepoint=65, max_codepoint=90),
+            "characters(min_codepoint=65, max_codepoint=90)",
+        ),
+        (
+            st.characters(codec="ascii", min_codepoint=32, max_codepoint=126),
+            "characters(min_codepoint=32, max_codepoint=126)",
+        ),
+        (
+            st.characters(categories=["Lu"], exclude_characters="AZ"),
+            "characters(categories=('Lu',), exclude_characters='AZ')",
+        ),
+    ],
+)
+def test_characters_repr(strategy, expected_repr):
+    assert repr(unwrap_strategies(strategy)) == expected_repr