Skip to content

Replace None value in list #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
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
3 changes: 3 additions & 0 deletions dpath/options.py
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
ALLOW_EMPTY_STRING_KEYS = False
REPLACE_NONE_VALUES_IN_LISTS = False
"""When creating a new subtree within a list, this option will cause dpath to treat None items as non-significant and \
overwrite them. Default behavior will cause an exception to be thrown instead."""
6 changes: 5 additions & 1 deletion dpath/segments.py
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,7 @@ def set(
if isinstance(segment, str) and isinstance(current, Sequence) and segment.isdigit():
segment = int(segment)

create_current = False
try:
# Optimistically try to get the next value. This makes the
# code agnostic to whether current is a list or a dict.
Expand All @@ -347,10 +348,13 @@ def set(
current[segment]
except:
if creator is not None:
creator(current, segments, i, hints)
create_current = True
else:
raise

if create_current or (options.REPLACE_NONE_VALUES_IN_LISTS and current[segment] is None):
creator(current, segments, i, hints)

current = current[segment]
if i != length - 1 and leaf(current):
raise PathNotFound(f"Path: {segments}[{i}]")
Expand Down
2 changes: 1 addition & 1 deletion dpath/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
VERSION = "2.1.2"
VERSION = "2.1.3"
19 changes: 19 additions & 0 deletions tests/test_new.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
from nose2.tools.such import helper

import dpath
from dpath import options


def test_set_new_separator():
Expand Down Expand Up @@ -91,3 +94,19 @@ def mycreator(obj, pathcomp, nextpathcomp, hints):
assert isinstance(d['a'], list)
assert len(d['a']) == 3
assert d['a'][2] == 3


def test_new_overwrite_none_in_list():
a = {}
dpath.new(a, ['b'], [])
dpath.new(a, ['b', 3], 5)
with helper.assertRaises(dpath.exceptions.PathNotFound):
dpath.new(a, ['b', 1, "c"], 5)

options.REPLACE_NONE_VALUES_IN_LISTS = True
a = {}
dpath.new(a, ['b'], [])
dpath.new(a, ['b', 3], 5)
dpath.new(a, ['b', 1, "c"], 5)

assert a["b"][1]["c"] == 5