Add frozendict to ast constants

Author: lgeiger

Lib/test/test_ast/test_ast.py

@@ -2683,6 +2683,11 @@ def test_validation(self):
         self.assertEqual(str(cm.exception),
                          "got an invalid type in Constant: list")
 
+        with self.assertRaises(TypeError) as cm:
+            self.compile_constant(frozendict({1: [2, 3]}))
+        self.assertEqual(str(cm.exception),
+                         "got an invalid type in Constant: list")
+
     def test_singletons(self):
         for const in (None, False, True, Ellipsis, b''):
             with self.subTest(const=const):
@@ -2692,13 +2697,15 @@ def test_singletons(self):
     def test_values(self):
         nested_tuple = (1,)
         nested_frozenset = frozenset({1})
+        nested_frozendict = frozendict({1: 1})
         for level in range(3):
             nested_tuple = (nested_tuple, 2)
             nested_frozenset = frozenset({nested_frozenset, 2})
+            nested_frozendict = frozendict({nested_frozendict: 2})
         values = (123, 123.0, 123j,
                   "unicode", b'bytes',
-                  tuple("tuple"), frozenset("frozenset"),
-                  nested_tuple, nested_frozenset)
+                  tuple("tuple"), frozenset("frozenset"), frozendict({"a": 1}),
+                  nested_tuple, nested_frozenset, nested_frozendict)
         for value in values:
             with self.subTest(value=value):
                 result = self.compile_constant(value)

Python/ast.c

@@ -198,6 +198,23 @@ validate_constant(PyObject *value)
         return 1;
     }
 
+    if (PyFrozenDict_CheckExact(value)) {
+        ENTER_RECURSIVE();
+
+        Py_ssize_t pos = 0;
+        PyObject *key, *val;
+
+        while (PyDict_Next(value, &pos, &key, &val)) {
+            if (!validate_constant(key) || !validate_constant(val)) {
+                LEAVE_RECURSIVE();
+                return 0;
+            }
+        }
+
+        LEAVE_RECURSIVE();
+        return 1;
+    }
+
     if (!PyErr_Occurred()) {
         PyErr_Format(PyExc_TypeError,
                      "got an invalid type in Constant: %s",