Skip to content

Accept list pairs inside tuple constructor inputs #160

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.

Sign up for GitHub

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

Closed
Eric3-jp wants to merge 1 commit into from
Closed

Accept list pairs inside tuple constructor inputs #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 1 deletion addict/addict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ def __init__(__self, *args, **kwargs):
elif isinstance(arg, dict):
for key, val in arg.items():
__self[key] = __self._hook(val)
elif isinstance(arg, tuple) and (not isinstance(arg[0], tuple)):
elif (isinstance(arg, tuple) and
not isinstance(arg[0], (tuple, list))):
__self[arg[0]] = __self._hook(arg[1])
else:
for key, val in iter(arg):
Expand Down
22 changes: 22 additions & 0 deletions test_addict.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,28 @@ def test_init_with_tuples(self):
prop = self.dict_class((0, 1), (1, 2), (2, 3))
self.assertDictEqual(prop, {0: 1, 1: 2, 2: 3})

def test_init_with_tuple_of_lists(self):
pairs = ([0, 1], [1, 2], [2, 3])
prop = self.dict_class(pairs)
self.assertDictEqual(prop, dict(pairs))

def test_init_with_tuple_of_one_list(self):
prop = self.dict_class((['a', {'b': 2}],))
self.assertDictEqual(prop, {'a': {'b': 2}})
self.assertIsInstance(prop.a, self.dict_class)
self.assertEqual(prop.a.b, 2)

def test_init_with_tuple_of_mixed_pairs(self):
pairs = (['a', 1], ((1, 2), {'b': 3}))
prop = self.dict_class(pairs)
self.assertDictEqual(prop, dict(pairs))
self.assertIsInstance(prop[(1, 2)], self.dict_class)

def test_init_with_tuple_of_tuples(self):
pairs = ((0, 1), (1, 2), (2, 3))
prop = self.dict_class(pairs)
self.assertDictEqual(prop, dict(pairs))

def test_init_with_list(self):
prop = self.dict_class([(0, 1), (1, 2), (2, 3)])
self.assertDictEqual(prop, {0: 1, 1: 2, 2: 3})
Expand Down