xmyshell 0.2.8__tar.gz → 0.2.10__tar.gz

{xmyshell-0.2.8/xmyshell.egg-info → xmyshell-0.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.2.8
+Version: 0.2.10
 Summary: XmyShell is a shell-like tool built on top of prompt_toolkit which provides a persistent Python runtime.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown

{xmyshell-0.2.8 → xmyshell-0.2.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "xmyshell"
-version = "0.2.8"
+version = "0.2.10"
 description = "XmyShell is a shell-like tool built on top of prompt_toolkit which provides a persistent Python runtime."
 readme = "README.md"
 requires-python = ">=3.12"

{xmyshell-0.2.8 → xmyshell-0.2.10}/xmyshell/kernel.py

@@ -3,6 +3,7 @@ import os
 import sys
 import runpy
 import subprocess
+import signal
 import shlex
 from .environment import namespace, aliases, xmyshell_alias, xmyshell_unalias
 from .utils import pywarning, pyerror, getcwd
@@ -14,6 +15,29 @@ def _reload() -> None:
     xmyshell_reload()
 
 
+def _run(*args, **kwargs) -> subprocess.CompletedProcess:
+    # Block SIGINT in the parent while the child runs, so that a Ctrl-C
+    # delivered to the console/process group is handled solely by the child.
+    #
+    # Without this, subprocess.run() would catch the KeyboardInterrupt
+    # raised in the parent, wait briefly, and then send SIGKILL to the
+    # child -- which is not what a shell should do. Here the parent stays
+    # silent, the child receives SIGINT as usual, and the caller's
+    # KeyboardInterrupt handler only fires for Ctrl-C at the prompt.
+    #
+    # Must run on the main thread: signal.signal() is not allowed elsewhere.
+    kwargs_preexec = {}
+    if os.name == "posix":
+        def _reset_sigint():
+            signal.signal(signal.SIGINT, signal.SIG_DFL)
+        kwargs_preexec["preexec_fn"] = _reset_sigint
+    old = signal.signal(signal.SIGINT, signal.SIG_IGN)
+    try:
+        return subprocess.run(*args, **kwargs_preexec, **kwargs)
+    finally:
+        signal.signal(signal.SIGINT, old)
+
+
 def xmyshell_source(path: str) -> None:
     _updated = runpy.run_path(
         path_name=os.path.expanduser(path),
@@ -162,7 +186,7 @@ def xmyshell_raw_command(cmd_line: str) -> int | None:
             return 0
 
         case "update":
-            returncode = subprocess.run(
+            returncode = _run(
                 [sys.executable, "-m", "xmyshell.update"]
                 + (args[1:] if len(args) > 1 else [])
             ).returncode
@@ -312,11 +336,11 @@ def xmyshell(cmd_line: str) -> int:
     if os.name == "nt":
         cmd_line = _fix_first_word(cmd_line)
     if target_var:
-        result = subprocess.run(
+        result = _run(
             cmd_line, shell=True, env=os.environ, capture_output=True, text=True
         )
         namespace[target_var] = result.stdout
     else:
-        result = subprocess.run(cmd_line, shell=True, env=os.environ)
+        result = _run(cmd_line, shell=True, env=os.environ)
 
     return result.returncode

{xmyshell-0.2.8 → xmyshell-0.2.10/xmyshell.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmyshell
-Version: 0.2.8
+Version: 0.2.10
 Summary: XmyShell is a shell-like tool built on top of prompt_toolkit which provides a persistent Python runtime.
 Requires-Python: >=3.12
 Description-Content-Type: text/markdown