summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2021-05-05 18:15:25 (GMT)
committerGitHub <noreply@github.com>2021-05-05 18:15:25 (GMT)
commit8f3ef457ad286e73f272dadec8b98d2ea3a6ec72 (patch)
tree34e0723dbb22fd14e2829f636caaadb0bc129f74
parent10d6f6bfd749c0e7da51a96f53ca326c336f7a00 (diff)
downloadcpython-8f3ef457ad286e73f272dadec8b98d2ea3a6ec72.zip
cpython-8f3ef457ad286e73f272dadec8b98d2ea3a6ec72.tar.gz
cpython-8f3ef457ad286e73f272dadec8b98d2ea3a6ec72.tar.bz2
bpo-43795: Mark PyCodec_Unregister as a function, not data, in stable ABI (GH-25920)
(cherry picked from commit cf86996a8e5965ff587040d0c2831c3132081a21) Co-authored-by: Petr Viktorin <encukou@gmail.com>
-rw-r--r--Misc/NEWS.d/next/C API/2021-05-05-19-04-50.bpo-43795.9Ojj73.rst2
-rw-r--r--Misc/stable_abi.txt2
-rwxr-xr-xPC/python3dll.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/Misc/NEWS.d/next/C API/2021-05-05-19-04-50.bpo-43795.9Ojj73.rst b/Misc/NEWS.d/next/C API/2021-05-05-19-04-50.bpo-43795.9Ojj73.rst
new file mode 100644
index 0000000..20a3823
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2021-05-05-19-04-50.bpo-43795.9Ojj73.rst
@@ -0,0 +1,2 @@
+:c:func:`PyCodec_Unregister` is now properly exported as a function in the
+Windows Stable ABI DLL.
diff --git a/Misc/stable_abi.txt b/Misc/stable_abi.txt
index 2a802bd..a78bcb7 100644
--- a/Misc/stable_abi.txt
+++ b/Misc/stable_abi.txt
@@ -2097,7 +2097,7 @@ function PyModule_AddObjectRef
added 3.10
data Py_FileSystemDefaultEncodeErrors
added 3.10
-data PyCodec_Unregister
+function PyCodec_Unregister
added 3.10
function PyErr_SetInterruptEx
added 3.10
diff --git a/PC/python3dll.c b/PC/python3dll.c
index 574d4dc..200d1d1 100755
--- a/PC/python3dll.c
+++ b/PC/python3dll.c
@@ -156,6 +156,7 @@ EXPORT_FUNC(PyCodec_ReplaceErrors)
EXPORT_FUNC(PyCodec_StreamReader)
EXPORT_FUNC(PyCodec_StreamWriter)
EXPORT_FUNC(PyCodec_StrictErrors)
+EXPORT_FUNC(PyCodec_Unregister)
EXPORT_FUNC(PyCodec_XMLCharRefReplaceErrors)
EXPORT_FUNC(PyComplex_FromDoubles)
EXPORT_FUNC(PyComplex_ImagAsDouble)
@@ -734,7 +735,6 @@ EXPORT_DATA(PyCallIter_Type)
EXPORT_DATA(PyCapsule_Type)
EXPORT_DATA(PyCFunction_Type)
EXPORT_DATA(PyClassMethodDescr_Type)
-EXPORT_DATA(PyCodec_Unregister)
EXPORT_DATA(PyComplex_Type)
EXPORT_DATA(PyDict_Type)
EXPORT_DATA(PyDictItems_Type)