commit ebc5a6b59ece48b490987bdaa2af842c29f5b2f8
author Miss Skeleton (bot) <31488909+miss-islington@users.noreply.github.com> Sat Oct 10 07:32:09 2020 -0700
committer GitHub <noreply@github.com> Sat Oct 10 07:32:09 2020 -0700
tree e1c7d7658302c76848da1a5621e6257dbebb1b84
parent 20bdeedfb4ebd250dad9834c96cb858d83c896cb

bpo-41986: Add Py_FileSystemDefaultEncodeErrors and Py_UTF8Mode back to limited API (GH-22621)

(cherry picked from commit 637a09b0d6e3ad4e34e0b5e0fc82f5afeae6f74b)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>

Include/cpython/fileobject.h

diff --git a/Include/cpython/fileobject.h b/Include/cpython/fileobject.h
index 57eac13..3005ce1 100644
--- a/Include/cpython/fileobject.h
+++ b/Include/cpython/fileobject.h
@@ -8,14 +8,6 @@
 
 PyAPI_FUNC(char *) Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *);
 
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
-PyAPI_DATA(const char *) Py_FileSystemDefaultEncodeErrors;
-#endif
-
-#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
-PyAPI_DATA(int) Py_UTF8Mode;
-#endif
-
 /* The std printer acts as a preliminary sys.stderr until the new io
    infrastructure is in place. */
 PyAPI_FUNC(PyObject *) PyFile_NewStdPrinter(int);

Include/fileobject.h

diff --git a/Include/fileobject.h b/Include/fileobject.h
index 456887e..6ec2994 100644
--- a/Include/fileobject.h
+++ b/Include/fileobject.h
@@ -20,8 +20,15 @@
    If non-NULL, this is different than the default encoding for strings
 */
 PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding;
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000
+PyAPI_DATA(const char *) Py_FileSystemDefaultEncodeErrors;
+#endif
 PyAPI_DATA(int) Py_HasFileSystemDefaultEncoding;
 
+#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000
+PyAPI_DATA(int) Py_UTF8Mode;
+#endif
+
 /* A routine to check if a file descriptor can be select()-ed. */
 #ifdef _MSC_VER
     /* On Windows, any socket fd can be select()-ed, no matter how high */