Skip to content

Commit 4427189

Browse files
committed
fix(modifs): ugly sfx list in sideffecter.repr()
1 parent 38656dd commit 4427189

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

graphtik/modifiers.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class _Modifier(str):
4949
#: the :term:`sideffected`, performed/required by the operation.
5050
#: If it is an empty tuple`, it is an abstract sideffect.
5151
sideffects: Tuple[Union[str, None]]
52-
#: pre-calculcated representation
52+
#: pre-calculated representation
5353
_repr: str
5454

5555
def __new__(
@@ -91,16 +91,16 @@ def __new__(
9191
name = f"sideffect: {str(name)!r}"
9292
else: # sideffected
9393
sideffected = name
94-
sfx_str = ", ".join(str(i) for i in sideffects)
94+
sfx_str = ", ".join(repr(i) for i in sideffects)
9595

9696
## Repr display also optionality & mapped-fn-kw
9797
# (irrelevant to object's identity)
9898
#
9999
qmark = "?" if optional else ""
100100
map_str = f", fn_kwarg={fn_kwarg!r}" if fn_kwarg else ""
101-
_repr = f"sideffected{qmark}({str(name)!r}<--{sfx_str!r}{map_str})"
101+
_repr = f"sideffected{qmark}({str(name)!r}<--{sfx_str}{map_str})"
102102

103-
name = f"sideffected({str(name)!r}<--{sfx_str!r})"
103+
name = f"sideffected({str(name)!r}<--{sfx_str})"
104104
elif optional or fn_kwarg:
105105
map_str = f"-->{fn_kwarg!r}" if fn_kwarg else ""
106106
_repr = (

test/test_modifiers.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,8 @@
2222
(lambda: varargs("d"), "d"),
2323
(lambda: sideffect("e"), "sideffect: 'e'"),
2424
(lambda: sideffect("e", optional=1), "sideffect: 'e'"),
25-
(lambda: sideffected("f", "ff"), "sideffected('f'<--'ff')"),
26-
(
27-
lambda: sideffected("f", "ff", fn_kwarg="F"),
28-
"sideffected('f'<--'ff')",
29-
),
25+
(lambda: sideffected("f", "a", "b"), "sideffected('f'<--'a', 'b')"),
26+
(lambda: sideffected("f", "ff", fn_kwarg="F"), "sideffected('f'<--'ff')",),
3027
(
3128
lambda: sideffected("f", "ff", optional=1, fn_kwarg="F"),
3229
"sideffected('f'<--'ff')",
@@ -52,7 +49,7 @@ def test_modifs_str(mod, exp):
5249
(lambda: varargs("d"), "varargs('d')"),
5350
(lambda: sideffect("e"), "sideffect: 'e'"),
5451
(lambda: sideffect("e", optional=1), "sideffect?: 'e'"),
55-
(lambda: sideffected("f", "ff"), "sideffected('f'<--'ff')"),
52+
(lambda: sideffected("f", "a", "b"), "sideffected('f'<--'a', 'b')"),
5653
(
5754
lambda: sideffected("f", "ff", fn_kwarg="F"),
5855
"sideffected('f'<--'ff', fn_kwarg='F')",
@@ -67,7 +64,6 @@ def test_modifs_str(mod, exp):
6764
def test_modifs_repr(mod, exp):
6865
mod = mod()
6966
print(repr(mod))
70-
# Strip outer quotes
7167
assert repr(mod) == exp
7268

7369

0 commit comments

Comments
 (0)