Check for signals more often

Author: vstinner

Modules/main.c

@@ -80,6 +80,12 @@ pymain_init(const _PyArgv *args)
 
 /* --- pymain_run_python() ---------------------------------------- */
 
+static int
+pymain_check_signals(void)
+{
+    return Py_MakePendingCalls();
+}
+
 /* Non-zero if filename, command (-c) or module (-m) is set
    on the command line */
 static inline int config_run_code(const PyConfig *config)
@@ -212,17 +218,21 @@ pymain_header(const PyConfig *config)
 }
 
 
-static void
+static int
 pymain_import_readline(const PyConfig *config)
 {
+    if (pymain_check_signals() < 0) {
+        return -1;
+    }
+
     if (config->isolated) {
-        return;
+        return 0;
     }
     if (!config->inspect && config_run_code(config)) {
-        return;
+        return 0;
     }
     if (!isatty(fileno(stdin))) {
-        return;
+        return 0;
     }
 
     PyObject *mod = PyImport_ImportModule("readline");
@@ -232,13 +242,15 @@ pymain_import_readline(const PyConfig *config)
     else {
         Py_DECREF(mod);
     }
+
     mod = PyImport_ImportModule("rlcompleter");
     if (mod == NULL) {
         PyErr_Clear();
     }
     else {
         Py_DECREF(mod);
     }
+    return 0;
 }
 
 
@@ -439,8 +451,7 @@ pymain_run_file_obj(PyObject *program_name, PyObject *filename,
         return 1;
     }
 
-    // Call pending calls like signal handlers (SIGINT)
-    if (Py_MakePendingCalls() == -1) {
+    if (pymain_check_signals() < 0) {
         fclose(fp);
         return pymain_exit_err_print();
     }
@@ -596,8 +607,7 @@ pymain_set_inspect(PyConfig *config, int inspect, int *exitcode)
 static int
 _pymain_run_repl(PyConfig *config, int startup)
 {
-    /* call pending calls like signal handlers (SIGINT) */
-    if (Py_MakePendingCalls() == -1) {
+    if (pymain_check_signals() < 0) {
         goto error;
     }
 
@@ -763,7 +773,9 @@ pymain_run_python(int *exitcode)
     }
 
     // import readline and rlcompleter before script dir is added to sys.path
-    pymain_import_readline(config);
+    if (pymain_import_readline(config) < 0) {
+        goto error;
+    }
 
     if (pymain_set_path0(main_importer_path) < 0) {
         goto error;
@@ -775,6 +787,10 @@ pymain_run_python(int *exitcode)
     set_running_main = 1;
     assert(!PyErr_Occurred());
 
+    if (pymain_check_signals() < 0) {
+        goto error;
+    }
+
     if (config->run_command) {
         *exitcode = pymain_run_command(config->run_command);
     }
@@ -791,6 +807,10 @@ pymain_run_python(int *exitcode)
         *exitcode = pymain_run_stdin(config);
     }
 
+    if (pymain_check_signals() < 0) {
+        goto error;
+    }
+
     pymain_repl(config, exitcode);
     goto done;