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 366dc3a

Browse filesBrowse files
nw0nw0
authored
bpo-35134: Move Include/{pyarena.h,pyctype.h} to Include/cpython/ (GH-24550)
Move non-limited C API headers pyarena.h and pyctype.h into Include/cpython/ directory.
1 parent 630264a commit 366dc3a
Copy full SHA for 366dc3a

File tree

Expand file treeCollapse file tree

9 files changed

+15
-15
lines changed
Filter options
Expand file treeCollapse file tree

9 files changed

+15
-15
lines changed

‎Include/Python.h

Copy file name to clipboardExpand all lines: Include/Python.h
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
#include "pystate.h"
138138
#include "context.h"
139139

140-
#include "pyarena.h"
140+
#include "cpython/pyarena.h"
141141
#include "modsupport.h"
142142
#include "compile.h"
143143
#include "pythonrun.h"
@@ -154,7 +154,7 @@
154154

155155
#include "eval.h"
156156

157-
#include "pyctype.h"
157+
#include "cpython/pyctype.h"
158158
#include "pystrtod.h"
159159
#include "pystrcmp.h"
160160
#include "fileutils.h"

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

Copy file name to clipboard
File renamed without changes.

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

Copy file name to clipboard
File renamed without changes.

‎Makefile.pre.in

Copy file name to clipboardExpand all lines: Makefile.pre.in
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,9 +1057,7 @@ PYTHON_HEADERS= \
10571057
$(srcdir)/Include/osmodule.h \
10581058
$(srcdir)/Include/patchlevel.h \
10591059
$(srcdir)/Include/picklebufobject.h \
1060-
$(srcdir)/Include/pyarena.h \
10611060
$(srcdir)/Include/pycapsule.h \
1062-
$(srcdir)/Include/pyctype.h \
10631061
$(srcdir)/Include/pydebug.h \
10641062
$(srcdir)/Include/pydtrace.h \
10651063
$(srcdir)/Include/pyerrors.h \
@@ -1113,6 +1111,8 @@ PYTHON_HEADERS= \
11131111
$(srcdir)/Include/cpython/methodobject.h \
11141112
$(srcdir)/Include/cpython/object.h \
11151113
$(srcdir)/Include/cpython/objimpl.h \
1114+
$(srcdir)/Include/cpython/pyarena.h \
1115+
$(srcdir)/Include/cpython/pyctype.h \
11161116
$(srcdir)/Include/cpython/pyerrors.h \
11171117
$(srcdir)/Include/cpython/pylifecycle.h \
11181118
$(srcdir)/Include/cpython/pymem.h \

‎Misc/NEWS.d/next/C API/2021-02-17-18-51-26.bpo-35134.YoQdk8.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 pyarena.h, pyctype.h, and pytime.h into the cpython/ directory. They
2+
must not be included directly, as they are already included by Python.h:
3+
:ref:`Include Files <api-includes>`.

‎PCbuild/pythoncore.vcxproj

Copy file name to clipboardExpand all lines: PCbuild/pythoncore.vcxproj
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@
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\pyarena.h" />
146+
<ClInclude Include="..\Include\cpython\pyctype.h" />
145147
<ClInclude Include="..\Include\cpython\pyerrors.h" />
146148
<ClInclude Include="..\Include\cpython\pylifecycle.h" />
147149
<ClInclude Include="..\Include\cpython\pymem.h" />
@@ -226,9 +228,7 @@
226228
<ClInclude Include="..\Include\parser_interface.h" />
227229
<ClInclude Include="..\Include\picklebufobject.h" />
228230
<ClInclude Include="..\Include\py_curses.h" />
229-
<ClInclude Include="..\Include\pyarena.h" />
230231
<ClInclude Include="..\Include\pycapsule.h" />
231-
<ClInclude Include="..\Include\pyctype.h" />
232232
<ClInclude Include="..\Include\pydebug.h" />
233233
<ClInclude Include="..\Include\pyerrors.h" />
234234
<ClInclude Include="..\Include\pyexpat.h" />

‎PCbuild/pythoncore.vcxproj.filters

Copy file name to clipboardExpand all lines: PCbuild/pythoncore.vcxproj.filters
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -177,15 +177,9 @@
177177
<ClInclude Include="..\Include\py_curses.h">
178178
<Filter>Include</Filter>
179179
</ClInclude>
180-
<ClInclude Include="..\Include\pyarena.h">
181-
<Filter>Include</Filter>
182-
</ClInclude>
183180
<ClInclude Include="..\Include\pycapsule.h">
184181
<Filter>Include</Filter>
185182
</ClInclude>
186-
<ClInclude Include="..\Include\pyctype.h">
187-
<Filter>Include</Filter>
188-
</ClInclude>
189183
<ClInclude Include="..\Include\pydebug.h">
190184
<Filter>Include</Filter>
191185
</ClInclude>
@@ -438,6 +432,12 @@
438432
<ClInclude Include="..\Include\cpython\object.h">
439433
<Filter>Include\cpython</Filter>
440434
</ClInclude>
435+
<ClInclude Include="..\Include\cpython\pyarena.h">
436+
<Filter>Include</Filter>
437+
</ClInclude>
438+
<ClInclude Include="..\Include\cpython\pyctype.h">
439+
<Filter>Include</Filter>
440+
</ClInclude>
441441
<ClInclude Include="..\Include\cpython\pyerrors.h">
442442
<Filter>Include\cpython</Filter>
443443
</ClInclude>

‎Parser/pegen.h

Copy file name to clipboardExpand all lines: Parser/pegen.h
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
#include <Python.h>
66
#include <token.h>
77
#include <Python-ast.h>
8-
#include <pyarena.h>
98

109
#if 0
1110
#define PyPARSE_YIELD_IS_KEYWORD 0x0001

‎Tools/scripts/stable_abi.py

Copy file name to clipboardExpand all lines: Tools/scripts/stable_abi.py
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@
2222
"genobject.h",
2323
"longintrepr.h",
2424
"parsetok.h",
25-
"pyarena.h",
2625
"pyatomic.h",
27-
"pyctype.h",
2826
"pydebug.h",
2927
"pytime.h",
3028
"symtable.h",

0 commit comments

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