diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2020-10-10 14:09:45 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-10 14:09:45 (GMT) |
| commit | 637a09b0d6e3ad4e34e0b5e0fc82f5afeae6f74b (patch) | |
| tree | 0ac037473921f43340376a42dc92023f7383107b | |
| parent | a42759351bff7b07fa8bf2cece0088f8539721d1 (diff) | |
| download | cpython-637a09b0d6e3ad4e34e0b5e0fc82f5afeae6f74b.zip cpython-637a09b0d6e3ad4e34e0b5e0fc82f5afeae6f74b.tar.gz cpython-637a09b0d6e3ad4e34e0b5e0fc82f5afeae6f74b.tar.bz2 | |
bpo-41986: Add Py_FileSystemDefaultEncodeErrors and Py_UTF8Mode back to limited API (GH-22621)
| -rw-r--r-- | Include/cpython/fileobject.h | 8 | ||||
| -rw-r--r-- | Include/fileobject.h | 7 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/C API/2020-10-09-22-50-46.bpo-41986.JUPE59.rst | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/Include/cpython/fileobject.h b/Include/cpython/fileobject.h index fb54cab..cff2243 100644 --- a/Include/cpython/fileobject.h +++ b/Include/cpython/fileobject.h @@ -4,14 +4,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); 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 @@ PyAPI_FUNC(int) PyObject_AsFileDescriptor(PyObject *); 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 */ diff --git a/Misc/NEWS.d/next/C API/2020-10-09-22-50-46.bpo-41986.JUPE59.rst b/Misc/NEWS.d/next/C API/2020-10-09-22-50-46.bpo-41986.JUPE59.rst new file mode 100644 index 0000000..d456ba6 --- /dev/null +++ b/Misc/NEWS.d/next/C API/2020-10-09-22-50-46.bpo-41986.JUPE59.rst @@ -0,0 +1,2 @@ +:c:data:`Py_FileSystemDefaultEncodeErrors` and :c:data:`Py_UTF8Mode` are +available again in limited API. |