diff --git a/Include/internal/pycore_call.h b/Include/internal/pycore_call.h index c92028a0129..49f5c3322de 100644 --- a/Include/internal/pycore_call.h +++ b/Include/internal/pycore_call.h @@ -8,7 +8,6 @@ extern "C" { # error "this header requires Py_BUILD_CORE define" #endif -#include "pycore_identifier.h" // _Py_Identifier #include "pycore_pystate.h" // _PyThreadState_GET() /* Suggested size (number of positional arguments) for arrays of PyObject* diff --git a/Include/internal/pycore_dict.h b/Include/internal/pycore_dict.h index cfe837b1e2b..9e0e1237915 100644 --- a/Include/internal/pycore_dict.h +++ b/Include/internal/pycore_dict.h @@ -9,7 +9,6 @@ extern "C" { #endif #include "pycore_freelist.h" // _PyFreeListState -#include "pycore_identifier.h" // _Py_Identifier #include "pycore_object.h" // PyManagedDictPointer #include "pycore_pyatomic_ft_wrappers.h" // FT_ATOMIC_LOAD_SSIZE_ACQUIRE diff --git a/Include/internal/pycore_identifier.h b/Include/internal/pycore_identifier.h deleted file mode 100644 index cda28810a48..00000000000 --- a/Include/internal/pycore_identifier.h +++ /dev/null @@ -1,20 +0,0 @@ -/* String Literals: _Py_Identifier API */ - -#ifndef Py_INTERNAL_IDENTIFIER_H -#define Py_INTERNAL_IDENTIFIER_H -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef Py_BUILD_CORE -# error "this header requires Py_BUILD_CORE define" -#endif - -extern PyObject* _PyType_LookupId(PyTypeObject *, _Py_Identifier *); -extern PyObject* _PyObject_LookupSpecialId(PyObject *, _Py_Identifier *); -extern int _PyObject_SetAttrId(PyObject *, _Py_Identifier *, PyObject *); - -#ifdef __cplusplus -} -#endif -#endif // !Py_INTERNAL_IDENTIFIER_H diff --git a/Include/internal/pycore_unicodeobject.h b/Include/internal/pycore_unicodeobject.h index f18a68582b9..20497ee9301 100644 --- a/Include/internal/pycore_unicodeobject.h +++ b/Include/internal/pycore_unicodeobject.h @@ -10,7 +10,6 @@ extern "C" { #include "pycore_lock.h" // PyMutex #include "pycore_fileutils.h" // _Py_error_handler -#include "pycore_identifier.h" // _Py_Identifier #include "pycore_ucnhash.h" // _PyUnicode_Name_CAPI #include "pycore_global_objects.h" // _Py_SINGLETON diff --git a/Makefile.pre.in b/Makefile.pre.in index da9f39fa042..41904a2183a 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -1178,7 +1178,6 @@ PYTHON_HEADERS= \ $(srcdir)/Include/internal/pycore_global_strings.h \ $(srcdir)/Include/internal/pycore_hamt.h \ $(srcdir)/Include/internal/pycore_hashtable.h \ - $(srcdir)/Include/internal/pycore_identifier.h \ $(srcdir)/Include/internal/pycore_import.h \ $(srcdir)/Include/internal/pycore_importdl.h \ $(srcdir)/Include/internal/pycore_initconfig.h \ diff --git a/Objects/object.c b/Objects/object.c index ce73728aa04..c4622359bb1 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1124,17 +1124,6 @@ _PyObject_GetAttrId(PyObject *v, _Py_Identifier *name) return result; } -int -_PyObject_SetAttrId(PyObject *v, _Py_Identifier *name, PyObject *w) -{ - int result; - PyObject *oname = _PyUnicode_FromId(name); /* borrowed */ - if (!oname) - return -1; - result = PyObject_SetAttr(v, oname, w); - return result; -} - int _PyObject_SetAttributeErrorContext(PyObject* v, PyObject* name) { diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 51a7adf5c40..d374a8e6393 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -2699,15 +2699,6 @@ _PyObject_LookupSpecialMethod(PyObject *self, PyObject *attr, PyObject **self_or return res; } -PyObject * -_PyObject_LookupSpecialId(PyObject *self, _Py_Identifier *attrid) -{ - PyObject *attr = _PyUnicode_FromId(attrid); /* borrowed */ - if (attr == NULL) - return NULL; - return _PyObject_LookupSpecial(self, attr); -} - static PyObject * lookup_maybe_method(PyObject *self, PyObject *attr, int *unbound) { @@ -5490,16 +5481,6 @@ _PyType_Lookup(PyTypeObject *type, PyObject *name) return res; } -PyObject * -_PyType_LookupId(PyTypeObject *type, _Py_Identifier *name) -{ - PyObject *oname; - oname = _PyUnicode_FromId(name); /* borrowed */ - if (oname == NULL) - return NULL; - return _PyType_Lookup(type, oname); -} - static void set_flags(PyTypeObject *self, unsigned long mask, unsigned long flags) {