mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-35134: Move Include/cellobject.h to Include/cpython/ (GH-28964)

Browse source
This commit is contained in:
Victor Stinner 2021-10-15 02:39:58 +02:00 • committed by GitHub
parent 37b1d607bf
commit 77b24ba505
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Doc/whatsnew/3.11.rst
View file

@ -572,10 +572,11 @@ Porting to Python 3.11
header provides functions like ``printf()`` and ``fopen()``.
(Contributed by Victor Stinner in :issue:`45434`.)
* The non-limited API file ``funcobject.h`` has been moved to the
``Include/cpython`` directory. This file must not be included directly, as it
is already included in ``Python.h``: :ref:`Include Files <api-includes>`. If
it has been included directly, consider including ``Python.h`` instead.
* The non-limited API files ``cellobject.h`` and ``funcobject.h`` have been
moved to the ``Include/cpython`` directory. These files must not be included
directly, as they are already included in ``Python.h``: :ref:`Include Files
<api-includes>`. If they have been included directly, consider including
``Python.h`` instead.
(Contributed by Victor Stinner in :issue:`35134`.)
Deprecated

2
Include/Python.h
View file

@ -68,7 +68,7 @@
#include "pyframe.h"
#include "traceback.h"
#include "sliceobject.h"
#include "cellobject.h"
#include "cpython/cellobject.h"
#include "iterobject.h"
#include "genobject.h"
#include "descrobject.h"

4
Include/cellobject.h → Include/cpython/cellobject.h
View file

@ -1,4 +1,5 @@
/* Cell object interface */
#ifndef Py_LIMITED_API
#ifndef Py_CELLOBJECT_H
#define Py_CELLOBJECT_H
@ -8,7 +9,8 @@ extern "C" {
typedef struct {
PyObject_HEAD
PyObject *ob_ref; /* Content of the cell or NULL when empty */
/* Content of the cell or NULL when empty */
PyObject *ob_ref;
} PyCellObject;
PyAPI_DATA(PyTypeObject) PyCell_Type;

2
Makefile.pre.in
View file

@ -1127,7 +1127,6 @@ PYTHON_HEADERS= \
$(srcdir)/Include/boolobject.h \
$(srcdir)/Include/bytearrayobject.h \
$(srcdir)/Include/bytesobject.h \
$(srcdir)/Include/cellobject.h \
$(srcdir)/Include/ceval.h \
$(srcdir)/Include/classobject.h \
$(srcdir)/Include/code.h \
@ -1201,6 +1200,7 @@ PYTHON_HEADERS= \
$(srcdir)/Include/cpython/abstract.h \
$(srcdir)/Include/cpython/bytearrayobject.h \
$(srcdir)/Include/cpython/bytesobject.h \
$(srcdir)/Include/cpython/cellobject.h \
$(srcdir)/Include/cpython/ceval.h \
$(srcdir)/Include/cpython/code.h \
$(srcdir)/Include/cpython/compile.h \

6
Misc/NEWS.d/next/C API/2021-10-15-00-11-51.bpo-35134.eX4zqy.rst
View file

@ -1,3 +1,3 @@
Move Include/funcobject.h header file to Include/cpython/funcobject.h.
C extensions should only include the main ``<Python.h>`` header.
Patch by Victor Stinner.
Move ``cellobject.h`` and ``funcobject.h`` header files from ``Include/`` to
``Include/cpython/``. C extensions should only include the main ``<Python.h>``
header. Patch by Victor Stinner.

2
PCbuild/pythoncore.vcxproj
View file

@ -115,7 +115,6 @@
<ClInclude Include="..\Include\boolobject.h" />
<ClInclude Include="..\Include\bytearrayobject.h" />
<ClInclude Include="..\Include\bytesobject.h" />
<ClInclude Include="..\Include\cellobject.h" />
<ClInclude Include="..\Include\ceval.h" />
<ClInclude Include="..\Include\classobject.h" />
<ClInclude Include="..\Include\code.h" />
@ -126,6 +125,7 @@
<ClInclude Include="..\Include\cpython\abstract.h" />
<ClInclude Include="..\Include\cpython\bytearrayobject.h" />
<ClInclude Include="..\Include\cpython\bytesobject.h" />
<ClInclude Include="..\Include\cpython\cellobject.h" />
<ClInclude Include="..\Include\cpython\ceval.h" />
<ClInclude Include="..\Include\cpython\code.h" />
<ClInclude Include="..\Include\cpython\compile.h" />

6
PCbuild/pythoncore.vcxproj.filters
View file

@ -51,9 +51,6 @@
<ClInclude Include="..\Include\bytesobject.h">
<Filter>Include</Filter>
</ClInclude>
<ClInclude Include="..\Include\cellobject.h">
<Filter>Include</Filter>
</ClInclude>
<ClInclude Include="..\Include\ceval.h">
<Filter>Include</Filter>
</ClInclude>
@ -372,6 +369,9 @@
<ClInclude Include="..\Include\cpython\bytesobject.h">
<Filter>Include\cpython</Filter>
</ClInclude>
<ClInclude Include="..\Include\cpython\cellobject.h">
<Filter>Include\cpython</Filter>
</ClInclude>
<ClInclude Include="..\Include\cpython\ceval.h">
<Filter>Include\cpython</Filter>
</ClInclude>