Skip to content

Commit a82f63f

Browse files
vstinnervstinner
authored
bpo-32381: Add _PyRun_AnyFileObject() (pythonGH-23723)
pymain_run_file() no longer encodes the filename: pass the filename as an object to the new _PyRun_AnyFileObject() function. Add new private functions: * _PyRun_AnyFileObject() * _PyRun_InteractiveLoopObject() * _Py_FdIsInteractive()
1 parent ca06440 commit a82f63f

5 files changed

Lines changed: 106 additions & 53 deletions

File tree

‎Include/cpython/pylifecycle.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ PyAPI_FUNC(void) _Py_PyAtExit(void (*func)(PyObject *), PyObject *);
4444
PyAPI_FUNC(void) _Py_RestoreSignals(void);
4545

4646
PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *);
47+
PyAPI_FUNC(int) _Py_FdIsInteractive(FILE *fp, PyObject *filename);
4748

4849
PyAPI_FUNC(void) _Py_SetProgramFullPath(const wchar_t *);
4950

‎Include/cpython/pythonrun.h‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ PyAPI_FUNC(int) PyRun_AnyFileExFlags(
1313
const char *filename, /* decoded from the filesystem encoding */
1414
int closeit,
1515
PyCompilerFlags *flags);
16+
PyAPI_FUNC(int) _PyRun_AnyFileObject(
17+
FILE *fp,
18+
PyObject *filename,
19+
int closeit,
20+
PyCompilerFlags *flags);
1621
PyAPI_FUNC(int) PyRun_SimpleFileExFlags(
1722
FILE *fp,
1823
const char *filename, /* decoded from the filesystem encoding */
@@ -30,6 +35,10 @@ PyAPI_FUNC(int) PyRun_InteractiveLoopFlags(
3035
FILE *fp,
3136
const char *filename, /* decoded from the filesystem encoding */
3237
PyCompilerFlags *flags);
38+
PyAPI_FUNC(int) _PyRun_InteractiveLoopObject(
39+
FILE *fp,
40+
PyObject *filename,
41+
PyCompilerFlags *flags);
3342

3443

3544
PyAPI_FUNC(PyObject *) PyRun_StringFlags(const char *, int, PyObject *,

‎Modules/main.c‎

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -313,17 +313,8 @@ pymain_run_file(const PyConfig *config, PyCompilerFlags *cf)
313313
}
314314
FILE *fp = _Py_wfopen(filename, L"rb");
315315
if (fp == NULL) {
316-
char *cfilename_buffer;
317-
const char *cfilename;
318-
int err = errno;
319-
cfilename_buffer = _Py_EncodeLocaleRaw(filename, NULL);
320-
if (cfilename_buffer != NULL)
321-
cfilename = cfilename_buffer;
322-
else
323-
cfilename = "<unprintable file name>";
324-
fprintf(stderr, "%ls: can't open file '%s': [Errno %d] %s\n",
325-
config->program_name, cfilename, err, strerror(err));
326-
PyMem_RawFree(cfilename_buffer);
316+
fprintf(stderr, "%ls: can't open file '%ls': [Errno %d] %s\n",
317+
config->program_name, filename, errno, strerror(errno));
327318
return 2;
328319
}
329320

@@ -353,25 +344,15 @@ pymain_run_file(const PyConfig *config, PyCompilerFlags *cf)
353344
return pymain_exit_err_print();
354345
}
355346

356-
PyObject *unicode, *bytes = NULL;
357-
const char *filename_str;
358-
359-
unicode = PyUnicode_FromWideChar(filename, wcslen(filename));
360-
if (unicode != NULL) {
361-
bytes = PyUnicode_EncodeFSDefault(unicode);
362-
Py_DECREF(unicode);
363-
}
364-
if (bytes != NULL) {
365-
filename_str = PyBytes_AsString(bytes);
366-
}
367-
else {
368-
PyErr_Clear();
369-
filename_str = "<filename encoding error>";
347+
PyObject *filename_obj = PyUnicode_FromWideChar(filename, -1);
348+
if (filename_obj == NULL) {
349+
PyErr_Print();
350+
return -1;
370351
}
371352

372353
/* PyRun_AnyFileExFlags(closeit=1) calls fclose(fp) before running code */
373-
int run = PyRun_AnyFileExFlags(fp, filename_str, 1, cf);
374-
Py_XDECREF(bytes);
354+
int run = _PyRun_AnyFileObject(fp, filename_obj, 1, cf);
355+
Py_XDECREF(filename_obj);
375356
return (run != 0);
376357
}
377358

‎Python/pylifecycle.c‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2739,6 +2739,21 @@ Py_FdIsInteractive(FILE *fp, const char *filename)
27392739
}
27402740

27412741

2742+
int
2743+
_Py_FdIsInteractive(FILE *fp, PyObject *filename)
2744+
{
2745+
if (isatty((int)fileno(fp))) {
2746+
return 1;
2747+
}
2748+
if (!Py_InteractiveFlag) {
2749+
return 0;
2750+
}
2751+
return (filename == NULL) ||
2752+
(PyUnicode_CompareWithASCIIString(filename, "<stdin>") == 0) ||
2753+
(PyUnicode_CompareWithASCIIString(filename, "???") == 0);
2754+
}
2755+
2756+
27422757
/* Wrappers around sigaction() or signal(). */
27432758

27442759
PyOS_sighandler_t

‎Python/pythonrun.c‎

Lines changed: 73 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -67,44 +67,69 @@ static PyObject* pyrun_file(FILE *fp, PyObject *filename, int start,
6767
PyCompilerFlags *flags);
6868

6969

70-
/* Parse input from a file and execute it */
7170
int
72-
PyRun_AnyFileExFlags(FILE *fp, const char *filename, int closeit,
71+
_PyRun_AnyFileObject(FILE *fp, PyObject *filename, int closeit,
7372
PyCompilerFlags *flags)
7473
{
75-
if (filename == NULL)
76-
filename = "???";
77-
if (Py_FdIsInteractive(fp, filename)) {
78-
int err = PyRun_InteractiveLoopFlags(fp, filename, flags);
79-
if (closeit)
74+
int decref_filename = 0;
75+
if (filename == NULL) {
76+
filename = PyUnicode_FromString("???");
77+
if (filename == NULL) {
78+
PyErr_Print();
79+
return -1;
80+
}
81+
decref_filename = 1;
82+
}
83+
84+
int res;
85+
if (_Py_FdIsInteractive(fp, filename)) {
86+
res = _PyRun_InteractiveLoopObject(fp, filename, flags);
87+
if (closeit) {
8088
fclose(fp);
81-
return err;
89+
}
90+
}
91+
else {
92+
res = _PyRun_SimpleFileObject(fp, filename, closeit, flags);
93+
}
94+
95+
if (decref_filename) {
96+
Py_DECREF(filename);
8297
}
83-
else
84-
return PyRun_SimpleFileExFlags(fp, filename, closeit, flags);
98+
return res;
8599
}
86100

101+
102+
/* Parse input from a file and execute it */
87103
int
88-
PyRun_InteractiveLoopFlags(FILE *fp, const char *filename_str, PyCompilerFlags *flags)
104+
PyRun_AnyFileExFlags(FILE *fp, const char *filename, int closeit,
105+
PyCompilerFlags *flags)
89106
{
90-
PyObject *filename, *v;
91-
int ret, err;
92-
PyCompilerFlags local_flags = _PyCompilerFlags_INIT;
93-
int nomem_count = 0;
94-
#ifdef Py_REF_DEBUG
95-
int show_ref_count = _Py_GetConfig()->show_ref_count;
96-
#endif
97-
98-
filename = PyUnicode_DecodeFSDefault(filename_str);
99-
if (filename == NULL) {
100-
PyErr_Print();
101-
return -1;
107+
PyObject *filename_obj;
108+
if (filename != NULL) {
109+
filename_obj = PyUnicode_DecodeFSDefault(filename);
110+
if (filename_obj == NULL) {
111+
PyErr_Print();
112+
return -1;
113+
}
102114
}
115+
else {
116+
filename_obj = NULL;
117+
}
118+
int res = _PyRun_AnyFileObject(fp, filename_obj, closeit, flags);
119+
Py_XDECREF(filename_obj);
120+
return res;
121+
}
103122

123+
124+
int
125+
_PyRun_InteractiveLoopObject(FILE *fp, PyObject *filename, PyCompilerFlags *flags)
126+
{
127+
PyCompilerFlags local_flags = _PyCompilerFlags_INIT;
104128
if (flags == NULL) {
105129
flags = &local_flags;
106130
}
107-
v = _PySys_GetObjectId(&PyId_ps1);
131+
132+
PyObject *v = _PySys_GetObjectId(&PyId_ps1);
108133
if (v == NULL) {
109134
_PySys_SetObjectId(&PyId_ps1, v = PyUnicode_FromString(">>> "));
110135
Py_XDECREF(v);
@@ -114,7 +139,13 @@ PyRun_InteractiveLoopFlags(FILE *fp, const char *filename_str, PyCompilerFlags *
114139
_PySys_SetObjectId(&PyId_ps2, v = PyUnicode_FromString("... "));
115140
Py_XDECREF(v);
116141
}
117-
err = 0;
142+
143+
#ifdef Py_REF_DEBUG
144+
int show_ref_count = _Py_GetConfig()->show_ref_count;
145+
#endif
146+
int err = 0;
147+
int ret;
148+
int nomem_count = 0;
118149
do {
119150
ret = PyRun_InteractiveOneObjectEx(fp, filename, flags);
120151
if (ret == -1 && PyErr_Occurred()) {
@@ -141,10 +172,26 @@ PyRun_InteractiveLoopFlags(FILE *fp, const char *filename_str, PyCompilerFlags *
141172
}
142173
#endif
143174
} while (ret != E_EOF);
144-
Py_DECREF(filename);
145175
return err;
146176
}
147177

178+
179+
int
180+
PyRun_InteractiveLoopFlags(FILE *fp, const char *filename, PyCompilerFlags *flags)
181+
{
182+
PyObject *filename_obj = PyUnicode_DecodeFSDefault(filename);
183+
if (filename_obj == NULL) {
184+
PyErr_Print();
185+
return -1;
186+
}
187+
188+
int err = _PyRun_InteractiveLoopObject(fp, filename_obj, flags);
189+
Py_DECREF(filename_obj);
190+
return err;
191+
192+
}
193+
194+
148195
/* A PyRun_InteractiveOneObject() auxiliary function that does not print the
149196
* error on failure. */
150197
static int

0 commit comments

Comments
 (0)