bpo-38896: Remove PyUnicode_ClearFreeList() function (GH-17354)

vstinner · web-flow · commit d68b592dd67c · 2019-11-23T02:30:32.000+01:00
Remove PyUnicode_ClearFreeList() function: the Unicode free list has
been removed in Python 3.3.
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
@@ -197,11 +197,6 @@ access internal read-only data of Unicode objects:
    .. versionadded:: 3.3
 
 
-.. c:function:: int PyUnicode_ClearFreeList()
-
-   Clear the free list. Return the total number of freed items.
-
-
 .. c:function:: Py_ssize_t PyUnicode_GET_SIZE(PyObject *o)
 
    Return the size of the deprecated :c:type:`Py_UNICODE` representation, in
diff --git a/Doc/whatsnew/3.9.rst b/Doc/whatsnew/3.9.rst
@@ -235,6 +235,10 @@ Build and C API Changes
   functions: the free lists of bound method objects have been removed.
   (Contributed by Inada Naoki and Victor Stinner in :issue:`37340`.)
 
+* Remove ``PyUnicode_ClearFreeList()`` function: the Unicode free list has been
+  removed in Python 3.3.
+  (Contributed by Victor Stinner in :issue:`38896`.)
+
 
 Deprecated
 ==========
diff --git a/Include/unicodeobject.h b/Include/unicodeobject.h
@@ -328,17 +328,6 @@ PyAPI_FUNC(wchar_t*) PyUnicode_AsWideCharString(
 
 PyAPI_FUNC(PyObject*) PyUnicode_FromOrdinal(int ordinal);
 
-/* --- Free-list management ----------------------------------------------- */
-
-/* Clear the free list used by the Unicode implementation.
-
-   This can be used to release memory used for objects on the free
-   list back to the Python memory allocator.
-
-*/
-
-PyAPI_FUNC(int) PyUnicode_ClearFreeList(void);
-
 /* === Builtin Codecs =====================================================
 
    Many of these APIs take two arguments encoding and errors. These
diff --git a/Misc/NEWS.d/next/C API/2019-11-22-19-43-43.bpo-38896.6wvNMJ.rst b/Misc/NEWS.d/next/C API/2019-11-22-19-43-43.bpo-38896.6wvNMJ.rst
@@ -0,0 +1,2 @@
+Remove ``PyUnicode_ClearFreeList()`` function: the Unicode free list has
+been removed in Python 3.3.
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
@@ -1031,7 +1031,6 @@ clear_freelists(void)
 {
     (void)PyFrame_ClearFreeList();
     (void)PyTuple_ClearFreeList();
-    (void)PyUnicode_ClearFreeList();
     (void)PyFloat_ClearFreeList();
     (void)PyList_ClearFreeList();
     (void)PyDict_ClearFreeList();
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -15332,14 +15332,6 @@ _PyUnicode_Init(void)
     return _PyStatus_OK();
 }
 
-/* Finalize the Unicode implementation */
-
-int
-PyUnicode_ClearFreeList(void)
-{
-    return 0;
-}
-
 
 void
 PyUnicode_InternInPlace(PyObject **p)
@@ -15951,7 +15943,6 @@ _PyUnicode_Fini(PyThreadState *tstate)
             Py_CLEAR(unicode_latin1[i]);
         }
         _PyUnicode_ClearStaticStrings();
-        (void)PyUnicode_ClearFreeList();
     }
 
     PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();
diff --git a/PC/python3.def b/PC/python3.def
@@ -649,7 +649,6 @@ EXPORTS
   PyUnicode_AsWideChar=python39.PyUnicode_AsWideChar
   PyUnicode_AsWideCharString=python39.PyUnicode_AsWideCharString
   PyUnicode_BuildEncodingMap=python39.PyUnicode_BuildEncodingMap
-  PyUnicode_ClearFreeList=python39.PyUnicode_ClearFreeList
   PyUnicode_Compare=python39.PyUnicode_Compare
   PyUnicode_CompareWithASCIIString=python39.PyUnicode_CompareWithASCIIString
   PyUnicode_Concat=python39.PyUnicode_Concat

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Remove ``PyUnicode_ClearFreeList()`` function: the Unicode free list has
	`2`	`+been removed in Python 3.3.`
Original file line number	Diff line number	Diff line change
`@@ -1031,7 +1031,6 @@ clear_freelists(void)`
`1031`	`1031`	`{`
`1032`	`1032`	`(void)PyFrame_ClearFreeList();`
`1033`	`1033`	`(void)PyTuple_ClearFreeList();`
`1034`		`- (void)PyUnicode_ClearFreeList();`
`1035`	`1034`	`(void)PyFloat_ClearFreeList();`
`1036`	`1035`	`(void)PyList_ClearFreeList();`
`1037`	`1036`	`(void)PyDict_ClearFreeList();`
Original file line number	Diff line number	Diff line change
`@@ -15332,14 +15332,6 @@ _PyUnicode_Init(void)`
`15332`	`15332`	`return _PyStatus_OK();`
`15333`	`15333`	`}`
`15334`	`15334`
`15335`		`-/* Finalize the Unicode implementation */`
`15336`		`-`
`15337`		`-int`
`15338`		`-PyUnicode_ClearFreeList(void)`
`15339`		`-{`
`15340`		`- return 0;`
`15341`		`-}`
`15342`		`-`
`15343`	`15335`
`15344`	`15336`	`void`
`15345`	`15337`	`PyUnicode_InternInPlace(PyObject **p)`
`@@ -15951,7 +15943,6 @@ _PyUnicode_Fini(PyThreadState *tstate)`
`15951`	`15943`	`Py_CLEAR(unicode_latin1[i]);`
`15952`	`15944`	`}`
`15953`	`15945`	`_PyUnicode_ClearStaticStrings();`
`15954`		`- (void)PyUnicode_ClearFreeList();`
`15955`	`15946`	`}`
`15956`	`15947`
`15957`	`15948`	`PyInterpreterState *interp = _PyInterpreterState_GET_UNSAFE();`