Skip to content

Commit 4c70d9f

Browse files
authored
bpo-34691: Compile _contextvars module into main Python library (GH-11741)
1 parent b82bfac commit 4c70d9f

File tree

6 files changed

+8
-95
lines changed

6 files changed

+8
-95
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
The _contextvars module is now built into the core Python library on
2+
Windows.

PC/config.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ extern PyObject* PyInit__string(void);
7272
extern PyObject* PyInit__stat(void);
7373
extern PyObject* PyInit__opcode(void);
7474

75+
extern PyObject* PyInit__contextvars(void);
76+
7577
/* tools/freeze/makeconfig.py marker for additional "extern" */
7678
/* -- ADDMODULE MARKER 1 -- */
7779

@@ -164,6 +166,8 @@ struct _inittab _PyImport_Inittab[] = {
164166
{"_stat", PyInit__stat},
165167
{"_opcode", PyInit__opcode},
166168

169+
{"_contextvars", PyInit__contextvars},
170+
167171
/* Sentinel */
168172
{0, 0}
169173
};

PCbuild/_contextvars.vcxproj

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

PCbuild/_contextvars.vcxproj.filters

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

PCbuild/pcbuild.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<!-- pyshellext.dll -->
5151
<Projects Include="pyshellext.vcxproj" />
5252
<!-- Extension modules -->
53-
<ExtensionModules Include="_asyncio;_contextvars;_ctypes;_decimal;_elementtree;_msi;_multiprocessing;_overlapped;pyexpat;_queue;select;unicodedata;winsound" />
53+
<ExtensionModules Include="_asyncio;_ctypes;_decimal;_elementtree;_msi;_multiprocessing;_overlapped;pyexpat;_queue;select;unicodedata;winsound" />
5454
<!-- Extension modules that require external sources -->
5555
<ExternalModules Include="_bz2;_lzma;_sqlite3" />
5656
<!-- venv launchers -->

Tools/msi/lib/lib_files.wxs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3-
<?define exts=pyexpat;select;unicodedata;winsound;_bz2;_elementtree;_socket;_ssl;_msi;_ctypes;_hashlib;_multiprocessing;_lzma;_decimal;_overlapped;_sqlite3;_asyncio;_queue;_contextvars ?>
3+
<?define exts=pyexpat;select;unicodedata;winsound;_bz2;_elementtree;_socket;_ssl;_msi;_ctypes;_hashlib;_multiprocessing;_lzma;_decimal;_overlapped;_sqlite3;_asyncio;_queue ?>
44
<Fragment>
55
<DirectoryRef Id="Lib_venv_scripts_nt" />
66

0 commit comments

Comments
 (0)