python · encukou · Apr 23, 2021 · Apr 16, 2021 · Apr 16, 2021 · Apr 20, 2021
diff --git a/Doc/data/stable_abi.dat b/Doc/data/stable_abi.dat
@@ -351,16 +351,11 @@ PyMapping_Length
 PyMapping_SetItemString
 PyMapping_Size
 PyMapping_Values
-PyMarshal_ReadObjectFromString
-PyMarshal_WriteLongToFile
-PyMarshal_WriteObjectToFile
-PyMarshal_WriteObjectToString
+PyMem_Calloc
 PyMem_Free
 PyMem_Malloc
 PyMem_Realloc
 PyMemberDescr_Type
-PyMember_GetOne
-PyMember_SetOne
 PyMemoryView_FromMemory
 PyMemoryView_FromObject
 PyMemoryView_GetContiguous

diff --git a/Include/cpython/fileutils.h b/Include/cpython/fileutils.h
@@ -32,6 +32,9 @@ PyAPI_FUNC(int) _Py_EncodeLocaleEx(
    int current_locale,
    _Py_error_handler errors);

+PyAPI_FUNC(char*) _Py_EncodeLocaleRaw(
+    const wchar_t *text,
+    size_t *error_pos);

 PyAPI_FUNC(PyObject *) _Py_device_encoding(int);


diff --git a/Include/cpython/pymem.h b/Include/cpython/pymem.h
@@ -10,8 +10,6 @@ PyAPI_FUNC(void) PyMem_RawFree(void *ptr);
 /* Try to get the allocators name set by _PyMem_SetupAllocators(). */
 PyAPI_FUNC(const char*) _PyMem_GetCurrentAllocatorName(void);

-PyAPI_FUNC(void *) PyMem_Calloc(size_t nelem, size_t elsize);
-
 /* strdup() using PyMem_RawMalloc() */
 PyAPI_FUNC(char *) _PyMem_RawStrdup(const char *str);


diff --git a/Include/fileutils.h b/Include/fileutils.h
@@ -12,10 +12,6 @@ PyAPI_FUNC(wchar_t *) Py_DecodeLocale(
 PyAPI_FUNC(char*) Py_EncodeLocale(
    const wchar_t *text,
    size_t *error_pos);
-
-PyAPI_FUNC(char*) _Py_EncodeLocaleRaw(
-    const wchar_t *text,
-    size_t *error_pos);
 #endif

 #ifndef Py_LIMITED_API

diff --git a/Include/pyhash.h b/Include/pyhash.h
@@ -77,15 +77,13 @@ typedef union {
    } expat;
 } _Py_HashSecret_t;
 PyAPI_DATA(_Py_HashSecret_t) _Py_HashSecret;
-#endif

 #ifdef Py_DEBUG
 PyAPI_DATA(int) _Py_HashSecret_Initialized;
 #endif


 /* hash function definition */
-#ifndef Py_LIMITED_API
 typedef struct {
    Py_hash_t (*const hash)(const void *, Py_ssize_t);
    const char *name;

diff --git a/Include/pymem.h b/Include/pymem.h
@@ -50,6 +50,7 @@ extern "C" {
 */

 PyAPI_FUNC(void *) PyMem_Malloc(size_t size);
+PyAPI_FUNC(void *) PyMem_Calloc(size_t nelem, size_t elsize);
 PyAPI_FUNC(void *) PyMem_Realloc(void *ptr, size_t new_size);
 PyAPI_FUNC(void) PyMem_Free(void *ptr);


diff --git a/Misc/NEWS.d/next/C API/2021-04-20-15-06-29.bpo-43795.y0IP4c.rst b/Misc/NEWS.d/next/C API/2021-04-20-15-06-29.bpo-43795.y0IP4c.rst
@@ -0,0 +1,2 @@
+:c:func:`PyMem_Calloc` is now available in the limited C API
+(``Py_LIMITED_API``).
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		:c:func:`PyMem_Calloc` is now available in the limited C API
		(``Py_LIMITED_API``).