bpo-31655: Validate keyword names in SimpleNamespace constructor. (#3909)
diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index 966ef6d..28133a3 100644
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -1069,6 +1069,8 @@
with self.assertRaises(TypeError):
types.SimpleNamespace(1, 2, 3)
+ with self.assertRaises(TypeError):
+ types.SimpleNamespace(**{1: 2})
self.assertEqual(len(ns1.__dict__), 0)
self.assertEqual(vars(ns1), {})
diff --git a/Objects/namespaceobject.c b/Objects/namespaceobject.c
index 6deca96..e5698e6 100644
--- a/Objects/namespaceobject.c
+++ b/Objects/namespaceobject.c
@@ -44,8 +44,12 @@
PyErr_Format(PyExc_TypeError, "no positional arguments expected");
return -1;
}
- if (kwds == NULL)
+ if (kwds == NULL) {
return 0;
+ }
+ if (!PyArg_ValidateKeywordArguments(kwds)) {
+ return -1;
+ }
return PyDict_Update(ns->ns_dict, kwds);
}