be more suspicious of getlocals()

This commit is contained in:
Guido van Rossum 1995-07-26 16:26:31 +00:00
parent bdd207af79
commit 53bb7fff11
1 changed files with 8 additions and 2 deletions

View File

@ -1105,7 +1105,8 @@ builtin_raw_input(self, args)
if (!newgetargs(args, "|O:[raw_]input", &v))
return NULL;
if (getfilefile(sysget("stdin")) == stdin &&
getfilefile(sysget("stdout")) == stdout) {
getfilefile(sysget("stdout")) == stdout &&
isatty(fileno(stdin)) && isatty(fileno(stdout))) {
object *po;
char *prompt;
char *s;
@ -1366,6 +1367,11 @@ builtin_vars(self, args)
return NULL;
if (v == NULL) {
d = getlocals();
if (d == NULL) {
if (!err_occurred())
err_setstr(SystemError, "no locals!?");
}
else
INCREF(d);
}
else {