FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-35081: Add pycore_fileutils.h (GH-10371) · python-emscripten/cpython@9fc57a3 · GitHub

  1. python-emscripten
  2. cpython

Repository navigation

Commit 9fc57a3

Browse files
vstinner
authored
bpo-35081: Add pycore_fileutils.h (pythonGH-10371)
Move Py_BUILD_CORE code from Include/fileutils.h to a new Include/internal/pycore_fileutils.h file.
1 parent bccacd1 commit 9fc57a3

7 files changed

Lines changed: 54 additions & 46 deletions

File tree

‎Include/fileutils.h‎

Lines changed: 13 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,9 @@
11
#ifndef Py_FILEUTILS_H
22
#define Py_FILEUTILS_H
3-
43
#ifdef __cplusplus
54
extern "C" {
65
#endif
76

8-
9-
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03080000
10-
typedef enum {
11-
_Py_ERROR_UNKNOWN=0,
12-
_Py_ERROR_STRICT,
13-
_Py_ERROR_SURROGATEESCAPE,
14-
_Py_ERROR_REPLACE,
15-
_Py_ERROR_IGNORE,
16-
_Py_ERROR_BACKSLASHREPLACE,
17-
_Py_ERROR_SURROGATEPASS,
18-
_Py_ERROR_XMLCHARREFREPLACE,
19-
_Py_ERROR_OTHER
20-
} _Py_error_handler;
21-
22-
PyAPI_FUNC(_Py_error_handler) _Py_GetErrorHandler(const char *errors);
23-
#endif
24-
25-
267
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000
278
PyAPI_FUNC(wchar_t *) Py_DecodeLocale(
289
const char *arg,
@@ -37,30 +18,22 @@ PyAPI_FUNC(char*) _Py_EncodeLocaleRaw(
3718
size_t *error_pos);
3819
#endif
3920

40-
#ifdef Py_BUILD_CORE
41-
PyAPI_FUNC(int) _Py_DecodeUTF8Ex(
42-
const char *arg,
43-
Py_ssize_t arglen,
44-
wchar_t **wstr,
45-
size_t *wlen,
46-
const char **reason,
47-
_Py_error_handler errors);
48-
49-
PyAPI_FUNC(int) _Py_EncodeUTF8Ex(
50-
const wchar_t *text,
51-
char **str,
52-
size_t *error_pos,
53-
const char **reason,
54-
int raw_malloc,
55-
_Py_error_handler errors);
5621

57-
PyAPI_FUNC(wchar_t*) _Py_DecodeUTF8_surrogateescape(
58-
const char *arg,
59-
Py_ssize_t arglen);
60-
#endif
22+
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03080000
23+
typedef enum {
24+
_Py_ERROR_UNKNOWN=0,
25+
_Py_ERROR_STRICT,
26+
_Py_ERROR_SURROGATEESCAPE,
27+
_Py_ERROR_REPLACE,
28+
_Py_ERROR_IGNORE,
29+
_Py_ERROR_BACKSLASHREPLACE,
30+
_Py_ERROR_SURROGATEPASS,
31+
_Py_ERROR_XMLCHARREFREPLACE,
32+
_Py_ERROR_OTHER
33+
} _Py_error_handler;
6134

35+
PyAPI_FUNC(_Py_error_handler) _Py_GetErrorHandler(const char *errors);
6236

63-
#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03080000
6437
PyAPI_FUNC(int) _Py_DecodeLocaleEx(
6538
const char *arg,
6639
wchar_t **wstr,
@@ -204,13 +177,7 @@ PyAPI_FUNC(int) _Py_GetLocaleconvNumeric(
204177

205178
#endif /* Py_LIMITED_API */
206179

207-
208-
#ifdef Py_BUILD_CORE
209-
PyAPI_FUNC(int) _Py_GetForceASCII(void);
210-
#endif
211-
212180
#ifdef __cplusplus
213181
}
214182
#endif
215-
216183
#endif /* !Py_FILEUTILS_H */

‎Include/internal/pycore_fileutils.h‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#ifndef Py_INTERNAL_FILEUTILS_H
2+
#define Py_INTERNAL_FILEUTILS_H
3+
#ifdef __cplusplus
4+
extern "C" {
5+
#endif
6+
7+
#ifndef Py_BUILD_CORE
8+
# error "Py_BUILD_CORE must be defined to include this header"
9+
#endif
10+
11+
PyAPI_FUNC(int) _Py_DecodeUTF8Ex(
12+
const char *arg,
13+
Py_ssize_t arglen,
14+
wchar_t **wstr,
15+
size_t *wlen,
16+
const char **reason,
17+
_Py_error_handler errors);
18+
19+
PyAPI_FUNC(int) _Py_EncodeUTF8Ex(
20+
const wchar_t *text,
21+
char **str,
22+
size_t *error_pos,
23+
const char **reason,
24+
int raw_malloc,
25+
_Py_error_handler errors);
26+
27+
PyAPI_FUNC(wchar_t*) _Py_DecodeUTF8_surrogateescape(
28+
const char *arg,
29+
Py_ssize_t arglen);
30+
31+
PyAPI_FUNC(int) _Py_GetForceASCII(void);
32+
33+
#ifdef __cplusplus
34+
}
35+
#endif
36+
#endif /* !Py_INTERNAL_FILEUTILS_H */

‎Modules/getpath.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#include "Python.h"
44
#include "osdefs.h"
5+
#include "pycore_fileutils.h"
56
#include "pycore_pathconfig.h"
67
#include "pycore_state.h"
78

‎Objects/unicodeobject.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
4040

4141
#define PY_SSIZE_T_CLEAN
4242
#include "Python.h"
43+
#include "pycore_fileutils.h"
4344
#include "pycore_state.h"
4445
#include "ucnhash.h"
4546
#include "bytes_methods.h"

‎Python/coreconfig.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "Python.h"
2+
#include "pycore_fileutils.h"
23
#include "pycore_lifecycle.h"
34
#include "pycore_mem.h"
45
#include "pycore_pathconfig.h"

‎Python/fileutils.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "Python.h"
2+
#include "pycore_fileutils.h"
23
#include "osdefs.h"
34
#include <locale.h>
45

‎Python/pathconfig.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "Python.h"
44
#include "osdefs.h"
55
#include "pycore_mem.h"
6+
#include "pycore_fileutils.h"
67
#include "pycore_pathconfig.h"
78
#include "pycore_state.h"
89
#include <wchar.h>

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL