Skip to content

Commit 42d4ff5

Browse files
committed
REFACT(modif) privatize jsonp attr ...
besides being uncanny for str to have more stuff, pandalone Pstep break :-(
1 parent 628769a commit 42d4ff5

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

graphtik/base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ def rename_driver(ren_args: RenArgs) -> str:
941941
return new_name
942942

943943
def rename_subdocs(ren_args):
944-
parts = getattr(ren_args.name, "jsonp", None)
944+
parts = getattr(ren_args.name, "_jsonp", None)
945945
if parts: # assuming deps here have been jsonpized earlier.
946946
path = "/".join(
947947
rename_driver(

graphtik/jsonpointer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ def jsonp_path(jsonpointer: str) -> List[str]:
8686
['']
8787
8888
"""
89-
# Optimization: modifier caches splitted parts as a "jsonp" attribute.
90-
parts = getattr(jsonpointer, "jsonp", None)
89+
# Optimization: modifier caches splitted parts as a "_jsonp" attribute.
90+
parts = getattr(jsonpointer, "_jsonp", None)
9191
if parts is False:
9292
parts = [jsonpointer]
9393
elif parts is None:

graphtik/modifier.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -308,29 +308,29 @@ def _modifier(
308308
for client code to extend its own modifiers.
309309
"""
310310
if jsonp is not None:
311-
kw["jsonp"] = jsonp # WARN: must be False or a collection for jsonp-accessors!
311+
kw["_jsonp"] = jsonp # WARN: must be False or a collection for jsonp-accessors!
312312
# Prevent sfx-jsonp.
313313
elif "/" in name and jsonp is None and (sideffected is None or sfx_list):
314314
from .jsonpointer import jsonp_path
315315

316-
kw["jsonp"] = jsonp_path(name)
316+
kw["_jsonp"] = jsonp_path(name)
317317
# Don't override user's accessor.
318318
#
319-
if not accessor and kw.get("jsonp"):
319+
if not accessor and kw.get("_jsonp"):
320320
accessor = JsonpAccessor()
321321

322322
args = (name, keyword, optional, accessor, sideffected, sfx_list)
323323
formats = _match_modifier_args(*args)
324324
if not formats:
325-
if kw.get("jsonp") is not None:
325+
if kw.get("_jsonp") is not None:
326326
# Just jsonp given.
327327
assert not accessor and (optional, accessor, sideffected, sfx_list) == (
328328
None,
329329
None,
330330
None,
331331
(),
332332
), locals()
333-
return _Modifier(name, name, f"jsonp", *args[1:], jsonp=jsonp)
333+
return _Modifier(name, name, "jsonp", *args[1:], jsonp=jsonp)
334334

335335
# Make a plain string instead.
336336
return str(name)
@@ -370,7 +370,7 @@ def modifier_withset(
370370
k: v
371371
for k, v in vars(dep).items()
372372
# Regenerate cached, truthy-only, jsnop-parts.
373-
if k != "jsonp" or not v
373+
if k != "_jsonp" or not v
374374
},
375375
**{k: v for k, v in locals().items() if v is not ...},
376376
**kw,
@@ -1049,7 +1049,7 @@ def is_varargish(dep) -> bool:
10491049

10501050
def get_jsonp(dep) -> Union[List[str], None]:
10511051
"""Check if the dependency is :term:`json pointer path` and return steps."""
1052-
return getattr(dep, "jsonp", None)
1052+
return getattr(dep, "_jsonp", None)
10531053

10541054

10551055
def is_sfx(dep) -> Optional[str]:

test/test_jsonpointer.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ class C(str):
6969

7070
p = C("a/b")
7171
assert jsonp_path(p) == ["a", "b"]
72-
p.jsonp = False
72+
p._jsonp = False
7373
assert jsonp_path(p) == [p]
74-
assert p.jsonp == False
75-
p.jsonp = None
74+
assert p._jsonp == False
75+
p._jsonp = None
7676
assert jsonp_path(p) == ["a", "b"]
77-
assert p.jsonp == None
77+
assert p._jsonp == None
7878

7979

8080
@pytest.mark.parametrize(

test/test_modifier.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,10 @@ def test_modifs_rename_fn(mod, exp, ser_method):
252252
# Check not just(!) `_repr` has changed.
253253
assert got.sideffected != dep.sideffected
254254

255-
if getattr(dep, "jsonp", None):
256-
assert got.jsonp != dep.jsonp
257-
assert got.jsonp == jsonp_path(got)
258-
assert got.jsonp == jsonp_path(str(got))
255+
if getattr(dep, "_jsonp", None):
256+
assert got._jsonp != dep._jsonp
257+
assert got._jsonp == jsonp_path(got)
258+
assert got._jsonp == jsonp_path(str(got))
259259

260260

261261
@pytest.mark.parametrize(

0 commit comments

Comments
 (0)