mirror of https://github.com/python/cpython
Move the "import readline" to an earlier place so it is also done when
"-i" is given. (Yes, I know, giving in to Marc Lemburg who wanted this :-)
This commit is contained in:
parent
b6a4716298
commit
3d26cc9542
|
@ -228,6 +228,16 @@ Py_Main(argc, argv)
|
|||
|
||||
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) {
|
||||
sts = PyRun_SimpleString(command) != 0;
|
||||
free(command);
|
||||
|
@ -243,14 +253,6 @@ Py_Main(argc, argv)
|
|||
fclose(fp);
|
||||
}
|
||||
}
|
||||
if (isatty(fileno(stdin))) {
|
||||
PyObject *v;
|
||||
v = PyImport_ImportModule("readline");
|
||||
if (v == NULL)
|
||||
PyErr_Clear();
|
||||
else
|
||||
Py_DECREF(v);
|
||||
}
|
||||
}
|
||||
sts = PyRun_AnyFile(
|
||||
fp,
|
||||
|
|
Loading…
Reference in New Issue