[3.12] gh-77782: Deprecate Py_HasFileSystemDefaultEncoding (GH-106272) (#106274)

gh-77782: Deprecate Py_HasFileSystemDefaultEncoding (GH-106272)

Deprecate Py_HasFileSystemDefaultEncoding variable.
(cherry picked from commit f3cf2ddd8ddc7dfa6b06e6da640391a1bcd62b8a)

Co-authored-by: Victor Stinner <vstinner@python.org>

diff --git a/Doc/whatsnew/3.12.rst b/Doc/whatsnew/3.12.rst
index 782a5013e869c7b98138ce4366244799f7bb149d..ec13ed57a5c45d22065408b898615753ce893317 100644 (file)
--- a/Doc/whatsnew/3.12.rst
+++ b/Doc/whatsnew/3.12.rst
@@ -1857,6 +1857,7 @@ Deprecated
   * :c:var:`Py_LegacyWindowsFSEncodingFlag`: use :c:member:`PyPreConfig.legacy_windows_fs_encoding`
   * :c:var:`Py_LegacyWindowsStdioFlag`: use :c:member:`PyConfig.legacy_windows_stdio`
   * :c:var:`!Py_FileSystemDefaultEncoding`: use :c:member:`PyConfig.filesystem_encoding`
+  * :c:var:`!Py_HasFileSystemDefaultEncoding`: use :c:member:`PyConfig.filesystem_encoding`
   * :c:var:`!Py_FileSystemDefaultEncodeErrors`: use :c:member:`PyConfig.filesystem_errors`
   * :c:var:`!Py_UTF8Mode`: use :c:member:`PyPreConfig.utf8_mode` (see :c:func:`Py_PreInitialize`)
 

diff --git a/Include/fileobject.h b/Include/fileobject.h
index 02bd7c915a23f79f1a31e67a00d59e2e267ced63..2deef544d667a568f567786decd4d474f062f10b 100644 (file)
--- a/Include/fileobject.h
+++ b/Include/fileobject.h
@@ -23,7 +23,7 @@ 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
-PyAPI_DATA(int) Py_HasFileSystemDefaultEncoding;
+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;