bpo-45482: Rename namespaceobject.h to pycore_namespace.h (GH-28975) · 180909/cpython@354c352 · GitHub
Skip to content

Commit 354c352

Browse files
vstinnervstinner
authored
bpo-45482: Rename namespaceobject.h to pycore_namespace.h (pythonGH-28975)
Rename Include/namespaceobject.h to Include/internal/pycore_namespace.h. The _testmultiphase extension is now built with the Py_BUILD_CORE_MODULE macro defined to access _PyNamespace_Type. object.c: remove unused "pycore_context.h" include.
1 parent a7f8dfd commit 354c352

14 files changed

Lines changed: 45 additions & 40 deletions

‎Include/Python.h‎

Lines changed: 0 additions & 1 deletion

‎Include/internal/pycore_namespace.h‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
// Simple namespace object interface
2+
3+
#ifndef Py_INTERNAL_NAMESPACE_H
4+
#define Py_INTERNAL_NAMESPACE_H
5+
#ifdef __cplusplus
6+
extern "C" {
7+
#endif
8+
9+
#ifndef Py_BUILD_CORE
10+
# error "this header requires Py_BUILD_CORE define"
11+
#endif
12+
13+
PyAPI_DATA(PyTypeObject) _PyNamespace_Type;
14+
15+
PyAPI_FUNC(PyObject *) _PyNamespace_New(PyObject *kwds);
16+
17+
#ifdef __cplusplus
18+
}
19+
#endif
20+
#endif // !Py_INTERNAL_NAMESPACE_H

‎Include/namespaceobject.h‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎Makefile.pre.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,6 @@ PYTHON_HEADERS= \
11511151
$(srcdir)/Include/methodobject.h \
11521152
$(srcdir)/Include/modsupport.h \
11531153
$(srcdir)/Include/moduleobject.h \
1154-
$(srcdir)/Include/namespaceobject.h \
11551154
$(srcdir)/Include/object.h \
11561155
$(srcdir)/Include/objimpl.h \
11571156
$(srcdir)/Include/opcode.h \
@@ -1261,6 +1260,7 @@ PYTHON_HEADERS= \
12611260
$(srcdir)/Include/internal/pycore_list.h \
12621261
$(srcdir)/Include/internal/pycore_long.h \
12631262
$(srcdir)/Include/internal/pycore_moduleobject.h \
1263+
$(srcdir)/Include/internal/pycore_namespace.h \
12641264
$(srcdir)/Include/internal/pycore_object.h \
12651265
$(srcdir)/Include/internal/pycore_pathconfig.h \
12661266
$(srcdir)/Include/internal/pycore_pyarena.h \

‎Modules/_testcapimodule.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,8 +1167,8 @@ test_get_type_qualname(PyObject *self, PyObject *Py_UNUSED(ignored))
11671167
assert(strcmp(PyUnicode_AsUTF8(tp_qualname), "int") == 0);
11681168
Py_DECREF(tp_qualname);
11691169

1170-
tp_qualname = PyType_GetQualName(&_PyNamespace_Type);
1171-
assert(strcmp(PyUnicode_AsUTF8(tp_qualname), "SimpleNamespace") == 0);
1170+
tp_qualname = PyType_GetQualName(&PyODict_Type);
1171+
assert(strcmp(PyUnicode_AsUTF8(tp_qualname), "OrderedDict") == 0);
11721172
Py_DECREF(tp_qualname);
11731173

11741174
PyObject *HeapTypeNameType = PyType_FromSpec(&HeapTypeNameType_Spec);

‎Modules/_testmultiphase.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44

55
#include "Python.h"
6+
#include "pycore_namespace.h" // _PyNamespace_New()
67

78
/* State for testing module state access from methods */
89

‎Modules/timemodule.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include "Python.h"
44
#include "pycore_fileutils.h" // _Py_BEGIN_SUPPRESS_IPH
5+
#include "pycore_namespace.h" // _PyNamespace_New()
56

67
#include <ctype.h>
78

‎Objects/namespaceobject.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// namespace object implementation
22

33
#include "Python.h"
4+
#include "pycore_namespace.h" // _PyNamespace_Type
45
#include "structmember.h" // PyMemberDef
56

67

‎Objects/object.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#include "Python.h"
55
#include "pycore_call.h" // _PyObject_CallNoArgs()
66
#include "pycore_ceval.h" // _Py_EnterRecursiveCall()
7-
#include "pycore_context.h"
8-
#include "pycore_dict.h"
7+
#include "pycore_dict.h" // _PyObject_MakeDictFromInstanceAttributes()
98
#include "pycore_floatobject.h" // _PyFloat_DebugMallocStats()
109
#include "pycore_initconfig.h" // _PyStatus_EXCEPTION()
10+
#include "pycore_namespace.h" // _PyNamespace_Type
1111
#include "pycore_object.h" // _PyType_CheckConsistency()
1212
#include "pycore_pyerrors.h" // _PyErr_Occurred()
1313
#include "pycore_pylifecycle.h" // _PyTypes_InitSlotDefs()

‎PCbuild/pythoncore.vcxproj‎

Lines changed: 1 addition & 1 deletion

0 commit comments

Comments
 (0)