Skip to content

gh-108191: Add support of positional argument in SimpleNamespace constructor #108195

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

Merged
serhiy-storchaka merged 17 commits into from
Apr 24, 2024
Merged

gh-108191: Add support of positional argument in SimpleNamespace constructor #108195

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c761180
gh-108191: Add support of positional argument in SimpleNamespace cons…
serhiy-storchaka Aug 21, 2023
06197a2
Update Objects/namespaceobject.c
serhiy-storchaka Aug 22, 2023
1127a87
Simplify the code.
serhiy-storchaka Aug 24, 2023
bc7ee1c
Update Objects/namespaceobject.c
serhiy-storchaka Aug 24, 2023
7338b2b
Merge branch 'main' into SimpleNamespace-pos-arg
serhiy-storchaka Aug 26, 2023
e94e97a
Polishing.
serhiy-storchaka Aug 26, 2023
f176567
Extend tests.
serhiy-storchaka Aug 26, 2023
cf7ac97
Apply suggestions from code review
serhiy-storchaka Aug 29, 2023
0476011
Apply suggestions from code review
serhiy-storchaka Sep 13, 2023
0c32cf2
Merge branch 'main' into SimpleNamespace-pos-arg
JelleZijlstra Jan 11, 2024
299d437
Apply suggestions from code review
serhiy-storchaka Mar 7, 2024
3e9f572
Merge branch 'main' into SimpleNamespace-pos-arg
serhiy-storchaka Mar 7, 2024
3c2002d
Update tests.
serhiy-storchaka Mar 7, 2024
e7ad7be
Update Objects/namespaceobject.c
serhiy-storchaka Mar 7, 2024
772b708
Extend errors tests.
serhiy-storchaka Mar 7, 2024
54b2acf
Fix typo.
serhiy-storchaka Mar 7, 2024
06b68ad
Merge branch 'main' into SimpleNamespace-pos-arg
JelleZijlstra Apr 24, 2024
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
Prev Previous commit
Next Next commit
Update tests.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Mar 7, 2024
commit 3c2002dc5ec4b3441e35e11b8ef249f65f40f87c
48 changes: 23 additions & 25 deletions Lib/test/test_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1755,18 +1755,29 @@ class Model(metaclass=ModelBase):
class SimpleNamespaceTests(unittest.TestCase):

def test_constructor(self):
ns1 = types.SimpleNamespace()
ns2 = types.SimpleNamespace(x=1, y=2)
ns3 = types.SimpleNamespace(**dict(x=1, y=2))
ns4 = types.SimpleNamespace({'x': 1, 'y': 2}, x=4, z=3)
ns5 = types.SimpleNamespace([['x', 1], ['y', 2]], x=4, z=3)
ns6 = types.SimpleNamespace(UserDict({'x': 1, 'y': 2}), x=4, z=3)
ns7 = types.SimpleNamespace({'x': 1, 'y': 2})
ns8 = types.SimpleNamespace([['x', 1], ['y', 2]])
ns9 = types.SimpleNamespace([], x=4, z=3)
ns10 = types.SimpleNamespace({}, x=4, z=3)
ns11 = types.SimpleNamespace([])
ns12 = types.SimpleNamespace({})
def check(ns, expected):
self.assertEqual(len(ns.__dict__), len(expected))
self.assertEqual(vars(ns), expected)
# check order
self.assertEqual(list(vars(ns).items()), list(expected.items()))
for name in expected:
self.assertEqual(getattr(ns, name), expected[name])

check(types.SimpleNamespace(), {})
check(types.SimpleNamespace(x=1, y=2), {'x': 1, 'y': 2})
check(types.SimpleNamespace(**dict(x=1, y=2)), {'x': 1, 'y': 2})
check(types.SimpleNamespace({'x': 1, 'y': 2}, x=4, z=3),
{'x': 4, 'y': 2, 'z': 3})
check(types.SimpleNamespace([['x', 1], ['y', 2]], x=4, z=3),
{'x': 4, 'y': 2, 'z': 3})
check(types.SimpleNamespace(UserDict({'x': 1, 'y': 2}), x=4, z=3),
{'x': 4, 'y': 2, 'z': 3})
check(types.SimpleNamespace({'x': 1, 'y': 2}), {'x': 1, 'y': 2})
check(types.SimpleNamespace([['x', 1], ['y', 2]]), {'x': 1, 'y': 2})
check(types.SimpleNamespace([], x=4, z=3), {'x': 4, 'z': 3})
check(types.SimpleNamespace({}, x=4, z=3), {'x': 4, 'z': 3})
check(types.SimpleNamespace([]), {})
check(types.SimpleNamespace({}), {})

with self.assertRaises(TypeError):
types.SimpleNamespace([], [])
Expand All @@ -1783,19 +1794,6 @@ def test_constructor(self):
with self.assertRaises(TypeError):
types.SimpleNamespace([[[], 2]]) # non-hashable key

self.assertEqual(len(ns1.__dict__), 0)
self.assertEqual(vars(ns1), {})
self.assertEqual(len(ns2.__dict__), 2)
self.assertEqual(vars(ns2), {'y': 2, 'x': 1})
self.assertEqual(len(ns3.__dict__), 2)
self.assertEqual(vars(ns3), {'y': 2, 'x': 1})
self.assertEqual(len(ns4.__dict__), 3)
self.assertEqual(vars(ns4), {'x': 4, 'y': 2, 'z': 3})
self.assertEqual(len(ns5.__dict__), 3)
self.assertEqual(vars(ns5), {'x': 4, 'y': 2, 'z': 3})
self.assertEqual(len(ns6.__dict__), 3)
self.assertEqual(vars(ns6), {'x': 4, 'y': 2, 'z': 3})

def test_unbound(self):
ns1 = vars(types.SimpleNamespace())
ns2 = vars(types.SimpleNamespace(x=1, y=2))
Expand Down