Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions glom/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,14 @@ def __init__(self, *path_parts):
path_t = _t_child(path_t, sub_parts[i], sub_parts[i + 1])
i += 2
else:
path_t = _t_child(path_t, 'P', part)
op = 'P'
if isinstance(part, basestring):
if '?' in part[:-1]:
raise ValueError('? only valid at the end of path segment')
if part.endswith('?'):
op = '?'
part = part[:-1]
path_t = _t_child(path_t, op, part)
self.path_t = path_t

@classmethod
Expand Down Expand Up @@ -460,6 +467,8 @@ def _format_path(t_path):
while i < len(t_path):
op, arg = t_path[i], t_path[i + 1]
i += 2
if op == '?': # fall through below
op, arg = 'P', arg + '?'
if op == 'P':
if cur_t_path:
path_parts.append(cur_t_path)
Expand Down Expand Up @@ -1205,13 +1214,15 @@ def _t_eval(target, _t, scope):
cur = cur[arg]
except (KeyError, IndexError, TypeError) as e:
raise PathAccessError(e, Path(_t), i // 2)
elif op == 'P':
elif op in ('P', '?'):
# Path type stuff (fuzzy match)
get = scope[TargetRegistry].get_handler('get', cur, path=t_path[2:i+2:2])
try:
cur = get(cur, arg)
except Exception as e:
raise PathAccessError(e, Path(_t), i // 2)
if cur is None and op == '?':
return None
elif op == '(':
args, kwargs = arg
scope[Path] += t_path[2:i+2:2]
Expand Down Expand Up @@ -1271,7 +1282,7 @@ def _format_t(path, root=T):
elif op == '(':
args, kwargs = arg
prepr.append(format_invocation(args=args, kwargs=kwargs, repr=bbrepr))
elif op == 'P':
elif op in ('P', '?'):
return _format_path(path)
i += 2
return "".join(prepr)
Expand Down
18 changes: 18 additions & 0 deletions glom/test/test_path_and_t.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,24 @@ def test_path_eq_t():
assert Path(T.a.b.c) != T.a.b



def test_path_null():
assert repr(Path.from_text('a?.b')) == "Path('a?', 'b')"
val = {'a': {'b': None}}
# null check on non-null has no effect
assert glom(val, 'a?.b') == glom(val, 'a.b')
# null check on null returns None instead of error
with raises(PathAccessError):
glom(val, 'a.b.c')
assert glom(val, 'a.b?.c') is None
# check that '?' in wrong place raises error
with raises(ValueError):
glom(val, 'a.b??')
# check that '?' on non-null-segment still raises error on null segment
with raises(PathAccessError):
glom(val, 'a?.b.c')


def test_startswith():
ref = T.a.b[1]

Expand Down