[3.6] bpo-31655: Validate keyword names in SimpleNamespace constructor. (GH-3909...

(cherry picked from commit 79ba471488b936abda5ba5234b1ea90cbc94cae6)

diff --git a/Lib/test/test_types.py b/Lib/test/test_types.py
index d79429faf118f6b949fd344ebc73f0e396e79ab8..73fbdbf9b904c995d80fdd06c534e0b6cf5c8723 100644 (file)
--- a/Lib/test/test_types.py
+++ b/Lib/test/test_types.py
@@ -1051,6 +1051,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 0bb30638445a93b96b30f9865fb5979b0a0fcd88..d28c9133b4b700b56fb1a03d4a03d085e473eb9d 100644 (file)
--- a/Objects/namespaceobject.c
+++ b/Objects/namespaceobject.c
@@ -50,8 +50,12 @@ namespace_init(_PyNamespaceObject *ns, PyObject *args, PyObject *kwds)
             return -1;
         }
     }
-    if (kwds == NULL)
+    if (kwds == NULL) {
         return 0;
+    }
+    if (!PyArg_ValidateKeywordArguments(kwds)) {
+        return -1;
+    }
     return PyDict_Update(ns->ns_dict, kwds);
 }