Centralize KeyboardInterrupt handling

Utilities will now automatically exit with status 130 (without
displaying a stack trace) upon `KeyboardInterrupt` exception, unless a
`try...except` for `KeyboardInterrupt` is registered by a specific
utility (e.g. for performing any necessary cleanup functions).

Author: Expertcoderz

userland/core/command.py

@@ -44,9 +44,13 @@ def create_utility(
         func: Callable[[Values, list[Any]], int],
     ) -> Callable[[], None]:
         def execute_utility():
-            sys.exit(
+            try:
+                sys.exit(
                 func(*parser.parse_args()) if parser else func(Values(), sys.argv[1:])
             )
+            except KeyboardInterrupt:
+                print()
+                sys.exit(130)
 
         return execute_utility
 

userland/utilities/factor.py

@@ -111,29 +111,25 @@ def format_exponents(factors: Iterable[int]) -> str:
 def python_userland_factor(opts, args: list[str]) -> int:
     failed = False
 
-    try:
-        for arg in args or core.readwords_stdin():
-            try:
-                num = int(arg)
-                if num < 0:
-                    raise ValueError
-            except ValueError:
-                failed = True
-                core.perror(f"'{arg}' is not a valid positive integer")
-                continue
-
-            if num < 2:
-                print(f"{num}:")
-                continue
-
-            factors = sorted(factorize(num))
-
-            print(
-                f"{num}: {format_exponents(factors) if opts.exponents
-                else " ".join(map(str, factors))}"
-            )
-    except KeyboardInterrupt:
-        print()
-        return 130
+    for arg in args or core.readwords_stdin():
+        try:
+            num = int(arg)
+            if num < 0:
+                raise ValueError
+        except ValueError:
+            failed = True
+            core.perror(f"'{arg}' is not a valid positive integer")
+            continue
+
+        if num < 2:
+            print(f"{num}:")
+            continue
+
+        factors = sorted(factorize(num))
+
+        print(
+            f"{num}: {format_exponents(factors) if opts.exponents
+            else " ".join(map(str, factors))}"
+        )
 
     return int(failed)

userland/utilities/reset.py

@@ -36,13 +36,9 @@ def python_userland_reset(opts, args: list[str]) -> int:
     if opts.q:
         if not term:
             core.perror("unknown terminal type ")
-            try:
-                while True:
-                    if term := input("Terminal type? "):
-                        break
-            except KeyboardInterrupt:
-                print()
-                return 130
+            while True:
+                if term := input("Terminal type? "):
+                    break
 
         print(term)
         return 0

userland/utilities/sleep.py

@@ -28,10 +28,6 @@ def python_userland_sleep(_, args) -> int:
                 parser.error(f"invalid duration: {spec}")
             total_secs += Decimal(spec[:-1]) * multiplier
 
-    try:
-        time.sleep(float(total_secs))
-    except KeyboardInterrupt:
-        print()
-        return 130
+    time.sleep(float(total_secs))
 
     return 0

userland/utilities/yes.py

@@ -14,4 +14,5 @@ def python_userland_yes(_, args) -> int:
         while True:
             print(string)
     except KeyboardInterrupt:
+        # Do not emit a trailing newline on keyboard interrupt.
         return 130