Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 77b24ba

Browse filesBrowse files
vstinnervstinner
authored
bpo-35134: Move Include/cellobject.h to Include/cpython/ (GH-28964)
1 parent 37b1d60 commit 77b24ba
Copy full SHA for 77b24ba

File tree

Expand file treeCollapse file tree

7 files changed

+17
-14
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+17
-14
lines changed

‎Doc/whatsnew/3.11.rst

Copy file name to clipboardExpand all lines: Doc/whatsnew/3.11.rst
+5-4Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -572,10 +572,11 @@ Porting to Python 3.11
572572
header provides functions like ``printf()`` and ``fopen()``.
573573
(Contributed by Victor Stinner in :issue:`45434`.)
574574

575-
* The non-limited API file ``funcobject.h`` has been moved to the
576-
``Include/cpython`` directory. This file must not be included directly, as it
577-
is already included in ``Python.h``: :ref:`Include Files <api-includes>`. If
578-
it has been included directly, consider including ``Python.h`` instead.
575+
* The non-limited API files ``cellobject.h`` and ``funcobject.h`` have been
576+
moved to the ``Include/cpython`` directory. These files must not be included
577+
directly, as they are already included in ``Python.h``: :ref:`Include Files
578+
<api-includes>`. If they have been included directly, consider including
579+
``Python.h`` instead.
579580
(Contributed by Victor Stinner in :issue:`35134`.)
580581

581582
Deprecated

‎Include/Python.h

Copy file name to clipboardExpand all lines: Include/Python.h
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
#include "pyframe.h"
6969
#include "traceback.h"
7070
#include "sliceobject.h"
71-
#include "cellobject.h"
71+
#include "cpython/cellobject.h"
7272
#include "iterobject.h"
7373
#include "genobject.h"
7474
#include "descrobject.h"

‎Include/cellobject.h renamed to ‎Include/cpython/cellobject.h

Copy file name to clipboardExpand all lines: Include/cpython/cellobject.h
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* Cell object interface */
2+
23
#ifndef Py_LIMITED_API
34
#ifndef Py_CELLOBJECT_H
45
#define Py_CELLOBJECT_H
@@ -8,7 +9,8 @@ extern "C" {
89

910
typedef struct {
1011
PyObject_HEAD
11-
PyObject *ob_ref; /* Content of the cell or NULL when empty */
12+
/* Content of the cell or NULL when empty */
13+
PyObject *ob_ref;
1214
} PyCellObject;
1315

1416
PyAPI_DATA(PyTypeObject) PyCell_Type;

‎Makefile.pre.in

Copy file name to clipboardExpand all lines: Makefile.pre.in
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,6 @@ PYTHON_HEADERS= \
11271127
$(srcdir)/Include/boolobject.h \
11281128
$(srcdir)/Include/bytearrayobject.h \
11291129
$(srcdir)/Include/bytesobject.h \
1130-
$(srcdir)/Include/cellobject.h \
11311130
$(srcdir)/Include/ceval.h \
11321131
$(srcdir)/Include/classobject.h \
11331132
$(srcdir)/Include/code.h \
@@ -1201,6 +1200,7 @@ PYTHON_HEADERS= \
12011200
$(srcdir)/Include/cpython/abstract.h \
12021201
$(srcdir)/Include/cpython/bytearrayobject.h \
12031202
$(srcdir)/Include/cpython/bytesobject.h \
1203+
$(srcdir)/Include/cpython/cellobject.h \
12041204
$(srcdir)/Include/cpython/ceval.h \
12051205
$(srcdir)/Include/cpython/code.h \
12061206
$(srcdir)/Include/cpython/compile.h \

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

Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
Move Include/funcobject.h header file to Include/cpython/funcobject.h.
2-
C extensions should only include the main ``<Python.h>`` header.
3-
Patch by Victor Stinner.
1+
Move ``cellobject.h`` and ``funcobject.h`` header files from ``Include/`` to
2+
``Include/cpython/``. C extensions should only include the main ``<Python.h>``
3+
header. Patch by Victor Stinner.

‎PCbuild/pythoncore.vcxproj

Copy file name to clipboardExpand all lines: PCbuild/pythoncore.vcxproj
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@
115115
<ClInclude Include="..\Include\boolobject.h" />
116116
<ClInclude Include="..\Include\bytearrayobject.h" />
117117
<ClInclude Include="..\Include\bytesobject.h" />
118-
<ClInclude Include="..\Include\cellobject.h" />
119118
<ClInclude Include="..\Include\ceval.h" />
120119
<ClInclude Include="..\Include\classobject.h" />
121120
<ClInclude Include="..\Include\code.h" />
@@ -126,6 +125,7 @@
126125
<ClInclude Include="..\Include\cpython\abstract.h" />
127126
<ClInclude Include="..\Include\cpython\bytearrayobject.h" />
128127
<ClInclude Include="..\Include\cpython\bytesobject.h" />
128+
<ClInclude Include="..\Include\cpython\cellobject.h" />
129129
<ClInclude Include="..\Include\cpython\ceval.h" />
130130
<ClInclude Include="..\Include\cpython\code.h" />
131131
<ClInclude Include="..\Include\cpython\compile.h" />

‎PCbuild/pythoncore.vcxproj.filters

Copy file name to clipboardExpand all lines: PCbuild/pythoncore.vcxproj.filters
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@
5151
<ClInclude Include="..\Include\bytesobject.h">
5252
<Filter>Include</Filter>
5353
</ClInclude>
54-
<ClInclude Include="..\Include\cellobject.h">
55-
<Filter>Include</Filter>
56-
</ClInclude>
5754
<ClInclude Include="..\Include\ceval.h">
5855
<Filter>Include</Filter>
5956
</ClInclude>
@@ -372,6 +369,9 @@
372369
<ClInclude Include="..\Include\cpython\bytesobject.h">
373370
<Filter>Include\cpython</Filter>
374371
</ClInclude>
372+
<ClInclude Include="..\Include\cpython\cellobject.h">
373+
<Filter>Include\cpython</Filter>
374+
</ClInclude>
375375
<ClInclude Include="..\Include\cpython\ceval.h">
376376
<Filter>Include\cpython</Filter>
377377
</ClInclude>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.