remove Py_FileSystemDefaultEncodeErrors

picnixz · picnixz · commit 9a322feddffc · 2025-05-08T12:12:11.000+02:00
The following are also removed:

- `_Py_SetFileSystemEncoding`
- `_Py_ClearFileSystemEncoding`
- `_Py_HasFileSystemDefaultEncodeErrors`
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_FileSystemDefaultEncodeErrors`:
-    Use :c:member:`PyConfig.filesystem_errors` or
-    :c:func:`PyConfig_Get("filesystem_errors") <PyConfig_Get>` instead.
   * :c:var:`!Py_UTF8Mode`:
     Use :c:member:`PyPreConfig.utf8_mode` or
     :c:func:`PyConfig_Get("utf8_mode") <PyConfig_Get>` instead.
diff --git a/Include/fileobject.h b/Include/fileobject.h
@@ -16,13 +16,6 @@ PyAPI_FUNC(int) PyFile_WriteObject(PyObject *, PyObject *, int);
 PyAPI_FUNC(int) PyFile_WriteString(const char *, PyObject *);
 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
-*/
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
-Py_DEPRECATED(3.12) PyAPI_DATA(const char *) Py_FileSystemDefaultEncodeErrors;
-#endif
-
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
 Py_DEPRECATED(3.12) PyAPI_DATA(int) Py_UTF8Mode;
 #endif
diff --git a/Include/internal/pycore_fileutils.h b/Include/internal/pycore_fileutils.h
@@ -190,8 +190,6 @@ extern int _Py_open_osfhandle(void *handle, int flags);
      ? _PyStatus_ERR("cannot decode " NAME) \
      : _PyStatus_NO_MEMORY()
 
-extern int _Py_HasFileSystemDefaultEncodeErrors;
-
 extern int _Py_DecodeUTF8Ex(
     const char *arg,
     Py_ssize_t arglen,
diff --git a/Include/internal/pycore_pylifecycle.h b/Include/internal/pycore_pylifecycle.h
@@ -13,10 +13,6 @@ extern "C" {
 /* Forward declarations */
 struct _PyArgv;
 
-extern int _Py_SetFileSystemEncoding(
-    const char *encoding,
-    const char *errors);
-extern void _Py_ClearFileSystemEncoding(void);
 extern PyStatus _PyUnicode_InitEncodings(PyThreadState *tstate);
 #ifdef MS_WINDOWS
 extern int _PyUnicode_EnableLegacyWindowsFSEncoding(void);
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
@@ -689,16 +689,12 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase):
         CONFIG_ISOLATED['legacy_windows_stdio'] = False
 
     # global config
-    DEFAULT_GLOBAL_CONFIG = {
-        '_Py_HasFileSystemDefaultEncodeErrors': 0,
-    }
     COPY_GLOBAL_PRE_CONFIG = [
         ('Py_UTF8Mode', 'utf8_mode'),
     ]
     COPY_GLOBAL_CONFIG = [
         # 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_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
@@ -2199,8 +2199,6 @@
     added = '3.10'
 [function.PyModule_AddObjectRef]
     added = '3.10'
-[data.Py_FileSystemDefaultEncodeErrors]
-    added = '3.10'
 [function.PyCodec_Unregister]
     added = '3.10'
 [function.PyErr_SetInterruptEx]
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -16516,17 +16516,6 @@ init_fs_codec(PyInterpreterState *interp)
     /* At this point, PyUnicode_EncodeFSDefault() and
        PyUnicode_DecodeFSDefault() can now use the Python codec rather than
        the C implementation of the filesystem encoding. */
-
-    /* Set Py_FileSystemDefaultEncodeErrors
-       global configuration variables. */
-    if (_Py_IsMainInterpreter(interp)) {
-
-        if (_Py_SetFileSystemEncoding(fs_codec->encoding,
-                                      fs_codec->errors) < 0) {
-            PyErr_NoMemory();
-            return -1;
-        }
-    }
     return 0;
 }
 
diff --git a/PC/python3dll.c b/PC/python3dll.c
diff --git a/Python/initconfig.c b/Python/initconfig.c
@@ -1,5 +1,5 @@
 #include "Python.h"
-#include "pycore_fileutils.h"     // _Py_HasFileSystemDefaultEncodeErrors
+#include "pycore_fileutils.h"     // _Py_GetLocaleEncoding()
 #include "pycore_getopt.h"        // _PyOS_GetOpt()
 #include "pycore_initconfig.h"    // _PyStatus_OK()
 #include "pycore_interp.h"        // _PyInterpreterState.runtime
@@ -498,9 +498,6 @@ _Py_COMP_DIAG_IGNORE_DEPR_DECLS
 #define SET_ITEM_STR(VAR) \
     SET_ITEM(#VAR, FROM_STRING(VAR))
 
-    SET_ITEM_STR(Py_FileSystemDefaultEncodeErrors);
-    SET_ITEM_INT(_Py_HasFileSystemDefaultEncodeErrors);
-
     SET_ITEM_INT(Py_UTF8Mode);
     SET_ITEM_INT(Py_InteractiveFlag);
 
diff --git a/Python/preconfig.c b/Python/preconfig.c
@@ -15,54 +15,6 @@ static void
 preconfig_copy(PyPreConfig *config, const PyPreConfig *config2);
 
 
-/* --- File system encoding/errors -------------------------------- */
-
-const char *Py_FileSystemDefaultEncodeErrors = NULL;
-int _Py_HasFileSystemDefaultEncodeErrors = 0;
-
-void
-_Py_ClearFileSystemEncoding(void)
-{
-_Py_COMP_DIAG_PUSH
-_Py_COMP_DIAG_IGNORE_DEPR_DECLS
-    if (!_Py_HasFileSystemDefaultEncodeErrors && Py_FileSystemDefaultEncodeErrors) {
-        PyMem_RawFree((char*)Py_FileSystemDefaultEncodeErrors);
-        Py_FileSystemDefaultEncodeErrors = NULL;
-    }
-_Py_COMP_DIAG_POP
-}
-
-
-/* Set Py_FileSystemDefaultEncodeErrors
-   global configuration variables to PyConfig.filesystem_encoding and
-   PyConfig.filesystem_errors (encoded to UTF-8).
-
-   Function called by _PyUnicode_InitEncodings(). */
-int
-_Py_SetFileSystemEncoding(const char *encoding, const char *errors)
-{
-    char *encoding2 = _PyMem_RawStrdup(encoding);
-    if (encoding2 == NULL) {
-        return -1;
-    }
-
-    char *errors2 = _PyMem_RawStrdup(errors);
-    if (errors2 == NULL) {
-        PyMem_RawFree(encoding2);
-        return -1;
-    }
-
-    _Py_ClearFileSystemEncoding();
-
-_Py_COMP_DIAG_PUSH
-_Py_COMP_DIAG_IGNORE_DEPR_DECLS
-    Py_FileSystemDefaultEncodeErrors = errors2;
-    _Py_HasFileSystemDefaultEncodeErrors = 0;
-_Py_COMP_DIAG_POP
-    return 0;
-}
-
-
 /* --- _PyArgv ---------------------------------------------------- */
 
 /* Decode bytes_argv using Py_DecodeLocale() */
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
@@ -1913,7 +1913,6 @@ finalize_interp_clear(PyThreadState *tstate)
     if (is_main_interp) {
         _Py_HashRandomization_Fini();
         _PyArg_Fini();
-        _Py_ClearFileSystemEncoding();
         _PyPerfTrampoline_Fini();
         _PyPerfTrampoline_FreeArenas();
     }
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_FileSystemDefaultEncodeErrors	-
-Python/preconfig.c	-	_Py_HasFileSystemDefaultEncodeErrors	-
 
 ## legacy config flags
 Python/initconfig.c	-	Py_UTF8Mode	-
