From 79ba471488b936abda5ba5234b1ea90cbc94cae6 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Sat, 7 Oct 2017 22:59:35 +0300 Subject: [PATCH] bpo-31655: Validate keyword names in SimpleNamespace constructor. (#3909) --- Lib/test/test_types.py | 2 ++ Objects/namespaceobject.c | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py index 966ef6d878..28133a3560 100644 --- a/Lib/test/test_types.py +++ b/Lib/test/test_types.py @@ -1069,6 +1069,8 @@ class SimpleNamespaceTests(unittest.TestCase): 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 6deca961a4..e5698e6378 100644 --- a/Objects/namespaceobject.c +++ b/Objects/namespaceobject.c @@ -44,8 +44,12 @@ namespace_init(_PyNamespaceObject *ns, PyObject *args, PyObject *kwds) 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); } -- 2.50.1