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 4a6bf27

Browse filesBrowse files
nw0nw0
authored
bpo-35134: Move non-limited C API files to Include/cpython/ (GH-24561)
Include/{odictobject.h,parser_interface.h,picklebufobject.h,pydebug.h,pyfpe.h} into Include/cpython/. Parser: peg_api: include Python.h instead of parser_interface.h.
1 parent 839184f commit 4a6bf27
Copy full SHA for 4a6bf27

File tree

Expand file treeCollapse file tree

14 files changed

+42
-34
lines changed
Filter options
Expand file treeCollapse file tree

14 files changed

+42
-34
lines changed

‎Doc/whatsnew/3.10.rst

Copy file name to clipboardExpand all lines: Doc/whatsnew/3.10.rst
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -934,6 +934,14 @@ Porting to Python 3.10
934934
bugs like ``if (PyList_SET_ITEM (a, b, c) < 0) ...`` test.
935935
(Contributed by Zackery Spytz and Victor Stinner in :issue:`30459`.)
936936
937+
* The non-limited API files ``odictobject.h``, ``parser_interface.h``,
938+
``picklebufobject.h``, ``pyarena.h``, ``pyctype.h``, ``pydebug.h``,
939+
``pyfpe.h``, and ``pytime.h`` have been moved to the ``Include/cpython``
940+
directory. These files must not be included directly, as they are already
941+
included in ``Python.h``: :ref:`Include Files <api-includes>`. If they have
942+
been included directly, consider including ``Python.h`` instead.
943+
(Contributed by Nicholas Sim in :issue:`35134`)
944+
937945
Deprecated
938946
----------
939947

‎Include/Python.h

Copy file name to clipboardExpand all lines: Include/Python.h
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
#include "typeslots.h"
9090
#include "pyhash.h"
9191

92-
#include "pydebug.h"
92+
#include "cpython/pydebug.h"
9393

9494
#include "bytearrayobject.h"
9595
#include "bytesobject.h"
@@ -104,7 +104,7 @@
104104
#include "tupleobject.h"
105105
#include "listobject.h"
106106
#include "dictobject.h"
107-
#include "odictobject.h"
107+
#include "cpython/odictobject.h"
108108
#include "enumobject.h"
109109
#include "setobject.h"
110110
#include "methodobject.h"
@@ -126,7 +126,7 @@
126126
#include "weakrefobject.h"
127127
#include "structseq.h"
128128
#include "namespaceobject.h"
129-
#include "picklebufobject.h"
129+
#include "cpython/picklebufobject.h"
130130
#include "cpython/pytime.h"
131131

132132
#include "codecs.h"
@@ -141,7 +141,7 @@
141141
#include "modsupport.h"
142142
#include "compile.h"
143143
#include "pythonrun.h"
144-
#include "parser_interface.h"
144+
#include "cpython/parser_interface.h"
145145
#include "pylifecycle.h"
146146
#include "ceval.h"
147147
#include "sysmodule.h"
@@ -158,7 +158,7 @@
158158
#include "pystrtod.h"
159159
#include "pystrcmp.h"
160160
#include "fileutils.h"
161-
#include "pyfpe.h"
161+
#include "cpython/pyfpe.h"
162162
#include "tracemalloc.h"
163163

164164
#endif /* !Py_PYTHON_H */

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

Copy file name to clipboard
File renamed without changes.

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

Copy file name to clipboard
File renamed without changes.

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

Copy file name to clipboard
File renamed without changes.

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

Copy file name to clipboard
File renamed without changes.

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

Copy file name to clipboard
File renamed without changes.

‎Makefile.pre.in

Copy file name to clipboardExpand all lines: Makefile.pre.in
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ PEGEN_OBJS= \
316316

317317

318318
PEGEN_HEADERS= \
319-
$(srcdir)/Include/parser_interface.h \
319+
$(srcdir)/Include/cpython/parser_interface.h \
320320
$(srcdir)/Parser/pegen.h \
321321
$(srcdir)/Parser/string_parser.h
322322

@@ -1056,17 +1056,13 @@ PYTHON_HEADERS= \
10561056
$(srcdir)/Include/namespaceobject.h \
10571057
$(srcdir)/Include/object.h \
10581058
$(srcdir)/Include/objimpl.h \
1059-
$(srcdir)/Include/odictobject.h \
10601059
$(srcdir)/Include/opcode.h \
10611060
$(srcdir)/Include/osdefs.h \
10621061
$(srcdir)/Include/osmodule.h \
10631062
$(srcdir)/Include/patchlevel.h \
1064-
$(srcdir)/Include/picklebufobject.h \
10651063
$(srcdir)/Include/pycapsule.h \
1066-
$(srcdir)/Include/pydebug.h \
10671064
$(srcdir)/Include/pydtrace.h \
10681065
$(srcdir)/Include/pyerrors.h \
1069-
$(srcdir)/Include/pyfpe.h \
10701066
$(srcdir)/Include/pyframe.h \
10711067
$(srcdir)/Include/pyhash.h \
10721068
$(srcdir)/Include/pylifecycle.h \
@@ -1116,9 +1112,13 @@ PYTHON_HEADERS= \
11161112
$(srcdir)/Include/cpython/methodobject.h \
11171113
$(srcdir)/Include/cpython/object.h \
11181114
$(srcdir)/Include/cpython/objimpl.h \
1115+
$(srcdir)/Include/cpython/odictobject.h \
1116+
$(srcdir)/Include/cpython/picklebufobject.h \
11191117
$(srcdir)/Include/cpython/pyarena.h \
11201118
$(srcdir)/Include/cpython/pyctype.h \
1119+
$(srcdir)/Include/cpython/pydebug.h \
11211120
$(srcdir)/Include/cpython/pyerrors.h \
1121+
$(srcdir)/Include/cpython/pyfpe.h \
11221122
$(srcdir)/Include/cpython/pylifecycle.h \
11231123
$(srcdir)/Include/cpython/pymem.h \
11241124
$(srcdir)/Include/cpython/pystate.h \

‎Misc/NEWS.d/next/C API/2021-02-18-18-46-42.bpo-35134.dFpEDT.rst

Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Move odictobject.h, parser_interface.h, picklebufobject.h, pydebug.h, and
2+
pyfpe.h into the cpython/ directory. They must not be included directly, as
3+
they are already included by Python.h: :ref:`Include Files <api-includes>`.

‎PCbuild/pythoncore.vcxproj

Copy file name to clipboardExpand all lines: PCbuild/pythoncore.vcxproj
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,14 @@
142142
<ClInclude Include="..\Include\cpython\methodobject.h" />
143143
<ClInclude Include="..\Include\cpython\object.h" />
144144
<ClInclude Include="..\Include\cpython\objimpl.h" />
145+
<ClInclude Include="..\Include\cpython\odictobject.h" />
146+
<ClInclude Include="..\Include\cpython\parser_interface.h" />
147+
<ClInclude Include="..\Include\cpython\picklebufobject.h" />
145148
<ClInclude Include="..\Include\cpython\pyarena.h" />
146149
<ClInclude Include="..\Include\cpython\pyctype.h" />
150+
<ClInclude Include="..\Include\cpython\pydebug.h" />
147151
<ClInclude Include="..\Include\cpython\pyerrors.h" />
152+
<ClInclude Include="..\Include\cpython\pyfpe.h" />
148153
<ClInclude Include="..\Include\cpython\pylifecycle.h" />
149154
<ClInclude Include="..\Include\cpython\pymem.h" />
150155
<ClInclude Include="..\Include\cpython\pystate.h" />
@@ -220,19 +225,14 @@
220225
<ClInclude Include="..\Include\namespaceobject.h" />
221226
<ClInclude Include="..\Include\object.h" />
222227
<ClInclude Include="..\Include\objimpl.h" />
223-
<ClInclude Include="..\Include\odictobject.h" />
224228
<ClInclude Include="..\Include\opcode.h" />
225229
<ClInclude Include="..\Include\osdefs.h" />
226230
<ClInclude Include="..\Include\osmodule.h" />
227231
<ClInclude Include="..\Include\patchlevel.h" />
228-
<ClInclude Include="..\Include\parser_interface.h" />
229-
<ClInclude Include="..\Include\picklebufobject.h" />
230232
<ClInclude Include="..\Include\py_curses.h" />
231233
<ClInclude Include="..\Include\pycapsule.h" />
232-
<ClInclude Include="..\Include\pydebug.h" />
233234
<ClInclude Include="..\Include\pyerrors.h" />
234235
<ClInclude Include="..\Include\pyexpat.h" />
235-
<ClInclude Include="..\Include\pyfpe.h" />
236236
<ClInclude Include="..\Include\pyframe.h" />
237237
<ClInclude Include="..\Include\pyhash.h" />
238238
<ClInclude Include="..\Include\pylifecycle.h" />

‎PCbuild/pythoncore.vcxproj.filters

Copy file name to clipboardExpand all lines: PCbuild/pythoncore.vcxproj.filters
+15-15Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -171,27 +171,18 @@
171171
<ClInclude Include="..\Include\patchlevel.h">
172172
<Filter>Include</Filter>
173173
</ClInclude>
174-
<ClInclude Include="..\Include\picklebufobject.h">
175-
<Filter>Include</Filter>
176-
</ClInclude>
177174
<ClInclude Include="..\Include\py_curses.h">
178175
<Filter>Include</Filter>
179176
</ClInclude>
180177
<ClInclude Include="..\Include\pycapsule.h">
181178
<Filter>Include</Filter>
182179
</ClInclude>
183-
<ClInclude Include="..\Include\pydebug.h">
184-
<Filter>Include</Filter>
185-
</ClInclude>
186180
<ClInclude Include="..\Include\pyerrors.h">
187181
<Filter>Include</Filter>
188182
</ClInclude>
189183
<ClInclude Include="..\Include\pyexpat.h">
190184
<Filter>Include</Filter>
191185
</ClInclude>
192-
<ClInclude Include="..\Include\pyfpe.h">
193-
<Filter>Include</Filter>
194-
</ClInclude>
195186
<ClInclude Include="..\Include\pylifecycle.h">
196187
<Filter>Include</Filter>
197188
</ClInclude>
@@ -378,9 +369,6 @@
378369
<ClInclude Include="..\Modules\hashtable.h">
379370
<Filter>Modules</Filter>
380371
</ClInclude>
381-
<ClInclude Include="..\Include\odictobject.h">
382-
<Filter>Include</Filter>
383-
</ClInclude>
384372
<ClInclude Include="..\Parser\pegen.h">
385373
<Filter>Parser</Filter>
386374
</ClInclude>
@@ -420,6 +408,9 @@
420408
<ClInclude Include="..\Include\cpython\listobject.h">
421409
<Filter>Include\cpython</Filter>
422410
</ClInclude>
411+
<ClInclude Include="..\Include\cpython\odictobject.h">
412+
<Filter>Include</Filter>
413+
</ClInclude>
423414
<ClInclude Include="..\Include\cpython\unicodeobject.h">
424415
<Filter>Include\cpython</Filter>
425416
</ClInclude>
@@ -432,15 +423,27 @@
432423
<ClInclude Include="..\Include\cpython\object.h">
433424
<Filter>Include\cpython</Filter>
434425
</ClInclude>
426+
<ClInclude Include="..\Include\cpython\parser_interface.h">
427+
<Filter>Include</Filter>
428+
</ClInclude>
429+
<ClInclude Include="..\Include\cpython\picklebufobject.h">
430+
<Filter>Include</Filter>
431+
</ClInclude>
435432
<ClInclude Include="..\Include\cpython\pyarena.h">
436433
<Filter>Include</Filter>
437434
</ClInclude>
438435
<ClInclude Include="..\Include\cpython\pyctype.h">
439436
<Filter>Include</Filter>
440437
</ClInclude>
438+
<ClInclude Include="..\Include\cpython\pydebug.h">
439+
<Filter>Include</Filter>
440+
</ClInclude>
441441
<ClInclude Include="..\Include\cpython\pyerrors.h">
442442
<Filter>Include\cpython</Filter>
443443
</ClInclude>
444+
<ClInclude Include="..\Include\cpython\pyfpe.h">
445+
<Filter>Include</Filter>
446+
</ClInclude>
444447
<ClInclude Include="..\Include\cpython\pymem.h">
445448
<Filter>Include\cpython</Filter>
446449
</ClInclude>
@@ -474,9 +477,6 @@
474477
<ClInclude Include="..\Include\cpython\initconfig.h">
475478
<Filter>Include\cpython</Filter>
476479
</ClInclude>
477-
<ClInclude Include="..\Include\parser_interface.h">
478-
<Filter>Include</Filter>
479-
</ClInclude>
480480
<ClInclude Include="..\Include\internal\pycore_warnings.h">
481481
<Filter>Include\internal</Filter>
482482
</ClInclude>

‎Parser/peg_api.c

Copy file name to clipboardExpand all lines: Parser/peg_api.c
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "parser_interface.h"
1+
#include "Python.h"
22

33
#include "tokenizer.h"
44
#include "pegen.h"

‎Python/pythonrun.c

Copy file name to clipboardExpand all lines: Python/pythonrun.c
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
#include "symtable.h" // PySymtable_BuildObject()
2727
#include "marshal.h" // PyMarshal_ReadLongFromFile()
2828

29-
#include "parser_interface.h" // PyParser_ASTFrom*
30-
3129
#ifdef MS_WINDOWS
3230
# include "malloc.h" // alloca()
3331
#endif

‎Tools/scripts/stable_abi.py

Copy file name to clipboardExpand all lines: Tools/scripts/stable_abi.py
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"longintrepr.h",
2424
"parsetok.h",
2525
"pyatomic.h",
26-
"pydebug.h",
2726
"pytime.h",
2827
"symtable.h",
2928
"token.h",

0 commit comments

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