remove c-level NoExtraItems singleton

Author: angela-tarantula

Include/internal/pycore_typevarobject.h

@@ -21,8 +21,6 @@ extern int _Py_typing_type_repr(PyUnicodeWriter *, PyObject *);
 extern PyTypeObject _PyTypeAlias_Type;
 extern PyTypeObject _PyNoDefault_Type;
 extern PyObject _Py_NoDefaultStruct;
-extern PyTypeObject _PyNoExtraItems_Type;
-extern PyObject _Py_NoExtraItemsStruct;
 
 #ifdef __cplusplus
 }

Lib/test/test_typing.py

@@ -41,7 +41,7 @@
 from typing import Self, LiteralString
 from typing import TypeAlias
 from typing import ParamSpec, Concatenate, ParamSpecArgs, ParamSpecKwargs
-from typing import TypeGuard, TypeIs, NoDefault, NoExtraItems
+from typing import TypeGuard, TypeIs, NoDefault
 import abc
 import textwrap
 import typing

Lib/typing.py

@@ -40,7 +40,6 @@
     Generic,
     Union,
     NoDefault,
-    NoExtraItems,
 )
 
 # Please keep __all__ alphabetized within each category.

Modules/_typingmodule.c

@@ -70,9 +70,6 @@ _typing_exec(PyObject *m)
     if (PyModule_AddObjectRef(m, "NoDefault", (PyObject *)&_Py_NoDefaultStruct) < 0) {
         return -1;
     }
-    if (PyModule_AddObjectRef(m, "NoExtraItems", (PyObject *)&_Py_NoExtraItemsStruct) < 0) {
-        return -1;
-    }
     return 0;
 }
 

Objects/typevarobject.c

@@ -123,63 +123,6 @@ PyTypeObject _PyNoDefault_Type = {
 
 PyObject _Py_NoDefaultStruct = _PyObject_HEAD_INIT(&_PyNoDefault_Type);
 
-/* NoExtraItems: a marker object for TypedDict extra_items when it's unset. */
-
-static PyObject *
-NoExtraItems_repr(PyObject *op)
-{
-    return PyUnicode_FromString("typing.NoExtraItems");
-}
-
-static PyObject *
-NoExtraItems_reduce(PyObject *op, PyObject *Py_UNUSED(ignored))
-{
-    return PyUnicode_FromString("NoExtraItems");
-}
-
-static PyMethodDef noextraitems_methods[] = {
-    {"__reduce__", NoExtraItems_reduce, METH_NOARGS, NULL},
-    {NULL, NULL}
-};
-
-static PyObject *
-noextraitems_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
-{
-    if (PyTuple_GET_SIZE(args) || (kwargs && PyDict_GET_SIZE(kwargs))) {
-        PyErr_SetString(PyExc_TypeError, "NoExtraItemsType takes no arguments");
-        return NULL;
-    }
-    return (PyObject *)&_Py_NoExtraItemsStruct;
-}
-
-static void
-noextraitems_dealloc(PyObject *obj)
-{
-    /* This should never get called, but we also don't want to SEGV if
-     * we accidentally decref NoExtraItems out of existence. Instead,
-     * since NoExtraItems is an immortal object, re-set the reference count.
-     */
-    _Py_SetImmortal(obj);
-}
-
-PyDoc_STRVAR(noextraitems_doc,
-"NoExtraItemsType()\n"
-"--\n\n"
-"The type of the NoExtraItems singleton.");
-
-PyTypeObject _PyNoExtraItems_Type = {
-    PyVarObject_HEAD_INIT(&PyType_Type, 0)
-    "NoExtraItemsType",
-    .tp_dealloc = noextraitems_dealloc,
-    .tp_repr = NoExtraItems_repr,
-    .tp_flags = Py_TPFLAGS_DEFAULT,
-    .tp_doc = noextraitems_doc,
-    .tp_methods = noextraitems_methods,
-    .tp_new = noextraitems_new,
-};
-
-PyObject _Py_NoExtraItemsStruct = _PyObject_HEAD_INIT(&_PyNoExtraItems_Type);
-
 typedef struct {
     PyObject_HEAD
     PyObject *value;

Tools/c-analyzer/cpython/ignored.tsv

@@ -344,8 +344,6 @@ Objects/obmalloc.c	-	obmalloc_state_main	-
 Objects/obmalloc.c	-	obmalloc_state_initialized	-
 Objects/typeobject.c	-	name_op	-
 Objects/typeobject.c	-	slotdefs	-
-Objects/typevarobject.c	-	_PyNoExtraItems_Type	-
-Objects/typevarobject.c	-	_Py_NoExtraItemsStruct	-
 Objects/unicodeobject.c	-	stripfuncnames	-
 Objects/unicodeobject.c	-	utf7_category	-
 Objects/unicodeobject.c	unicode_decode_call_errorhandler_wchar	argparse	-