mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-01 14:38:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Move the "import readline" to an earlier place so it is also done when

Browse source 
"-i" is given.  (Yes, I know, giving in to Marc Lemburg who wanted
this :-)
This commit is contained in:
Guido van Rossum 1997-09-16 16:11:28 +00:00
parent b6a4716298
commit 3d26cc9542
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Modules/main.c
View file

@ -228,6 +228,16 @@ Py_Main(argc, argv)
PySys_SetArgv(argc-optind, argv+optind); PySys_SetArgv(argc-optind, argv+optind);
if ((inspect || (command == NULL && filename == NULL)) &&
isatty(fileno(stdin))) {
PyObject *v;
v = PyImport_ImportModule("readline");
if (v == NULL)
PyErr_Clear();
else
Py_DECREF(v);
}
if (command) { if (command) {
sts = PyRun_SimpleString(command) != 0; sts = PyRun_SimpleString(command) != 0;
free(command); free(command);
@ -243,14 +253,6 @@ Py_Main(argc, argv)
fclose(fp); fclose(fp);
} }
} }
if (isatty(fileno(stdin))) {
PyObject *v;
v = PyImport_ImportModule("readline");
if (v == NULL)
PyErr_Clear();
else
Py_DECREF(v);
}
} }
sts = PyRun_AnyFile( sts = PyRun_AnyFile(
fp, fp,