remove Py_FileSystemDefaultEncoding and `Py_HasFileSystemDefaultEnc…

…oding`
picnixz · May 8, 2025 · May 8, 2025 · May 8, 2025 · May 8, 2025 · May 8, 2025
commit 54ff2aac82167bc3e806caf6550b426f8bfa51b3
diff --git a/Doc/data/stable_abi.dat b/Doc/data/stable_abi.dat
diff --git a/Doc/deprecations/c-api-pending-removal-in-3.15.rst b/Doc/deprecations/c-api-pending-removal-in-3.15.rst
@@ -71,9 +71,6 @@ Pending removal in Python 3.15
   * :c:var:`Py_InteractiveFlag`:
     Use :c:member:`PyConfig.interactive` or
     :c:func:`PyConfig_Get("interactive") <PyConfig_Get>` instead.
-  * :c:var:`!Py_FileSystemDefaultEncoding`, :c:var:`!Py_HasFileSystemDefaultEncoding`:
-    Use :c:member:`PyConfig.filesystem_encoding` or
-    :c:func:`PyConfig_Get("filesystem_encoding") <PyConfig_Get>` instead.
   * :c:var:`!Py_FileSystemDefaultEncodeErrors`:
     Use :c:member:`PyConfig.filesystem_errors` or
     :c:func:`PyConfig_Get("filesystem_errors") <PyConfig_Get>` instead.

diff --git a/Include/fileobject.h b/Include/fileobject.h
@@ -19,11 +19,9 @@ PyAPI_FUNC(int) PyObject_AsFileDescriptor(PyObject *);
 /* The default encoding used by the platform file system APIs
    If non-NULL, this is different than the default encoding for strings
 */
-Py_DEPRECATED(3.12) PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding;
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
 Py_DEPRECATED(3.12) PyAPI_DATA(const char *) Py_FileSystemDefaultEncodeErrors;
 #endif
-Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_HasFileSystemDefaultEncoding;
 
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
 Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_UTF8Mode;

diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
@@ -690,7 +690,6 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
 
     # global config
     DEFAULT_GLOBAL_CONFIG = {
-        'Py_HasFileSystemDefaultEncoding': 0,
         '_Py_HasFileSystemDefaultEncodeErrors': 0,
     }
     COPY_GLOBAL_PRE_CONFIG = [
@@ -700,7 +699,6 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
         # Copy core config to global config for expected values
         # True means that the core config value is inverted (0 => 1 and 1 => 0)
         ('Py_FileSystemDefaultEncodeErrors', 'filesystem_errors'),
-        ('Py_FileSystemDefaultEncoding', 'filesystem_encoding'),
         ('Py_InteractiveFlag', 'interactive'),
     ]
 

diff --git a/Lib/test/test_stable_abi_ctypes.py b/Lib/test/test_stable_abi_ctypes.py
diff --git a/Misc/stable_abi.toml b/Misc/stable_abi.toml
@@ -1620,8 +1620,6 @@
     added = '3.2'
 [function.Py_FatalError]
     added = '3.2'
-[data.Py_FileSystemDefaultEncoding]
-    added = '3.2'
 [function.Py_Finalize]
     added = '3.2'
 [function.Py_GetBuildInfo]
@@ -1648,8 +1646,6 @@
     added = '3.2'
 [function.Py_GetVersion]
     added = '3.2'
-[data.Py_HasFileSystemDefaultEncoding]
-    added = '3.2'
 [function.Py_IncRef]
     added = '3.2'
 [function.Py_Initialize]

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -16517,7 +16517,7 @@ init_fs_codec(PyInterpreterState *interp)
        PyUnicode_DecodeFSDefault() can now use the Python codec rather than
        the C implementation of the filesystem encoding. */
 
-    /* Set Py_FileSystemDefaultEncoding and Py_FileSystemDefaultEncodeErrors
+    /* Set Py_FileSystemDefaultEncodeErrors
        global configuration variables. */
     if (_Py_IsMainInterpreter(interp)) {
 

diff --git a/PC/python3dll.c b/PC/python3dll.c
diff --git a/Python/initconfig.c b/Python/initconfig.c
@@ -498,8 +498,6 @@ _Py_COMP_DIAG_IGNORE_DEPR_DECLS
 #define SET_ITEM_STR(VAR) \
     SET_ITEM(#VAR, FROM_STRING(VAR))
 
-    SET_ITEM_STR(Py_FileSystemDefaultEncoding);
-    SET_ITEM_INT(Py_HasFileSystemDefaultEncoding);
     SET_ITEM_STR(Py_FileSystemDefaultEncodeErrors);
     SET_ITEM_INT(_Py_HasFileSystemDefaultEncodeErrors);
 

diff --git a/Python/preconfig.c b/Python/preconfig.c
@@ -17,8 +17,6 @@ preconfig_copy(PyPreConfig *config, const PyPreConfig *config2);
 
 /* --- File system encoding/errors -------------------------------- */
 
-const char *Py_FileSystemDefaultEncoding = NULL;
-int Py_HasFileSystemDefaultEncoding = 0;
 const char *Py_FileSystemDefaultEncodeErrors = NULL;
 int _Py_HasFileSystemDefaultEncodeErrors = 0;
 
@@ -27,10 +25,6 @@ _Py_ClearFileSystemEncoding(void)
 {
 _Py_COMP_DIAG_PUSH
 _Py_COMP_DIAG_IGNORE_DEPR_DECLS
-    if (!Py_HasFileSystemDefaultEncoding && Py_FileSystemDefaultEncoding) {
-        PyMem_RawFree((char*)Py_FileSystemDefaultEncoding);
-        Py_FileSystemDefaultEncoding = NULL;
-    }
     if (!_Py_HasFileSystemDefaultEncodeErrors && Py_FileSystemDefaultEncodeErrors) {
         PyMem_RawFree((char*)Py_FileSystemDefaultEncodeErrors);
         Py_FileSystemDefaultEncodeErrors = NULL;
@@ -39,7 +33,7 @@ _Py_COMP_DIAG_POP
 }
 
 
-/* Set Py_FileSystemDefaultEncoding and Py_FileSystemDefaultEncodeErrors
+/* Set Py_FileSystemDefaultEncodeErrors
    global configuration variables to PyConfig.filesystem_encoding and
    PyConfig.filesystem_errors (encoded to UTF-8).
 
@@ -62,9 +56,6 @@ _Py_SetFileSystemEncoding(const char *encoding, const char *errors)
 
 _Py_COMP_DIAG_PUSH
 _Py_COMP_DIAG_IGNORE_DEPR_DECLS
-    Py_FileSystemDefaultEncoding = encoding2;
-    Py_HasFileSystemDefaultEncoding = 0;
-
     Py_FileSystemDefaultEncodeErrors = errors2;
     _Py_HasFileSystemDefaultEncodeErrors = 0;
 _Py_COMP_DIAG_POP

diff --git a/Tools/c-analyzer/cpython/ignored.tsv b/Tools/c-analyzer/cpython/ignored.tsv
@@ -102,8 +102,6 @@ Python/initconfig.c	-	PYPRECONFIG_SPEC	-
 ## public C-API
 
 ## deprecated
-Python/preconfig.c	-	Py_FileSystemDefaultEncoding	-
-Python/preconfig.c	-	Py_HasFileSystemDefaultEncoding	-
 Python/preconfig.c	-	Py_FileSystemDefaultEncodeErrors	-
 Python/preconfig.c	-	_Py_HasFileSystemDefaultEncodeErrors	-