Remove core.safeopen()

Questionable utility. Complicates typechecking. ("Is the file opened in
text or binary mode?")

Author: Expertcoderz

userland/core/io.py

@@ -1,7 +1,6 @@
-import contextlib
 import os
 import sys
-from typing import Any, Generator, IO
+from typing import Any, Generator
 
 
 def perror(*errors: Any) -> None:
@@ -11,17 +10,6 @@ def perror(*errors: Any) -> None:
     )
 
 
-@contextlib.contextmanager
-def safe_open(*args, **kwargs) -> Generator[IO | None]:
-    try:
-        # pylint: disable=unspecified-encoding
-        with open(*args, **kwargs) as io:
-            yield io
-    except OSError as e:
-        perror(e)
-        yield None
-
-
 def readlines_stdin() -> Generator[str]:
     while line := sys.stdin.readline():
         yield line

userland/utilities/sum.py

@@ -54,11 +54,11 @@ def python_userland_sum(opts, args: list[str]) -> int:
         if name == "-":
             print(SUM_ALGORITHMS[opts.algorithm](sys.stdin.buffer.read()))
         else:
-            with core.safe_open(name, "rb") as io:
-                if not io:
-                    failed = True
-                    continue
-
-                print(f"{SUM_ALGORITHMS[opts.algorithm](io.read())} {name}")
+            try:
+                with open(name, "rb") as f:
+                    print(f"{SUM_ALGORITHMS[opts.algorithm](f.read())} {name}")
+            except OSError as e:
+                failed = True
+                core.perror(e)
 
     return int(failed)

userland/utilities/sync.py

@@ -34,11 +34,11 @@ def python_userland_sync(opts, args: list[str]) -> int:
     failed = False
 
     for name in tqdm(args, ascii=True, desc="Syncing files") if opts.progress else args:
-        with core.safe_open(name, "rb+") as io:
-            if not io:
-                failed = True
-                continue
-
-            os.fsync(io)
+        try:
+            with open(name, "rb+") as f:
+                os.fsync(f)
+        except OSError as e:
+            failed = True
+            core.perror(e)
 
     return int(failed)

userland/utilities/truncate.py

@@ -114,13 +114,13 @@ def python_userland_truncate(opts, args: list[str]) -> int:
         if new_size == old_size:
             continue
 
-        with core.safe_open(file, "rb+") as io:
-            if not io:
-                failed = True
-                continue
-
-            io.truncate(
-                new_size * stat.st_blksize if opts.io_blocks else new_size,
-            )
+        try:
+            with open(file, "rb+") as f:
+                f.truncate(
+                    new_size * stat.st_blksize if opts.io_blocks else new_size,
+                )
+        except OSError as e:
+            failed = True
+            core.perror(e)
 
     return int(failed)