mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-09 20:35:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Issue #7111: Python can now be run without a stdin, stdout or stderr stream.

Browse source 
It was already the case with Python 2.  However, the corresponding
sys module entries are now set to None (instead of an unusable file object).
This commit is contained in:
Antoine Pitrou 2011-11-28 19:08:36 +01:00
parent 22b9b37915
commit 11942a58a1
3 changed files with 59 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Python/pythonrun.c
View file

@ -892,6 +892,19 @@ error:
return NULL;
}
static int
is_valid_fd(int fd)
{
int dummy_fd;
if (fd < 0 || !_PyVerify_fd(fd))
return 0;
dummy_fd = dup(fd);
if (dummy_fd < 0)
return 0;
close(dummy_fd);
return 1;
}
/* Initialize sys.stdin, stdout, stderr and builtins.open */
static int
initstdio(void)
@ -951,13 +964,9 @@ initstdio(void)
* and fileno() may point to an invalid file descriptor. For example
* GUI apps don't have valid standard streams by default.
*/
if (fd < 0) {
#ifdef MS_WINDOWS
if (!is_valid_fd(fd)) {
std = Py_None;
Py_INCREF(std);
#else
goto error;
#endif
}
else {
std = create_stdio(iomod, fd, 0, "<stdin>", encoding, errors);
@ -970,13 +979,9 @@ initstdio(void)
/* Set sys.stdout */
fd = fileno(stdout);
if (fd < 0) {
#ifdef MS_WINDOWS
if (!is_valid_fd(fd)) {
std = Py_None;
Py_INCREF(std);
#else
goto error;
#endif
}
else {
std = create_stdio(iomod, fd, 1, "<stdout>", encoding, errors);
@ -990,13 +995,9 @@ initstdio(void)
#if 1 /* Disable this if you have trouble debugging bootstrap stuff */
/* Set sys.stderr, replaces the preliminary stderr */
fd = fileno(stderr);
if (fd < 0) {
#ifdef MS_WINDOWS
if (!is_valid_fd(fd)) {
std = Py_None;
Py_INCREF(std);
#else
goto error;
#endif
}
else {
std = create_stdio(iomod, fd, 1, "<stderr>", encoding, "backslashreplace");