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 :-)
diff --git a/Modules/main.c b/Modules/main.c
index b882ff9..ef18fe6 100644
--- a/Modules/main.c
+++ b/Modules/main.c
@@ -228,6 +228,16 @@
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 @@
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,