#102 mypy: enable error codes truthy-bool and truthy-iterable

Author: mpsijm

.pre-commit-config.yaml

@@ -30,6 +30,8 @@ repos:
         args:
         -   --check-untyped-defs
         -   --exclude=test
+        -   --enable-error-code=truthy-bool
+        -   --enable-error-code=truthy-iterable
         -   --no-incremental  # Fixes ruamel.yaml, see https://stackoverflow.com/a/65223004
         -   --python-version=3.10
         -   --scripts-are-modules

bin/interactive.py

@@ -460,18 +460,18 @@ def close_io(stream: Optional[IO[bytes]]) -> None:
                     if stream:
                         stream.close()
 
-                if validator:
+                if validator is not None:
                     validator.wait()
                     close_io(validator.stdin)
                     close_io(validator.stdout)
                     close_io(validator.stderr)
-                if team_tee:
+                if team_tee is not None:
                     team_tee.wait()
                     close_io(team_tee.stdin)
-                if val_tee:
+                if val_tee is not None:
                     val_tee.wait()
                     close_io(val_tee.stdout)
-                if submission:
+                if submission is not None:
                     submission.wait()
                     close_io(submission.stderr)
 

bin/run.py

@@ -356,7 +356,7 @@ def _get_expected_verdicts(self) -> list[Verdict]:
         expected_verdicts.sort()
         return expected_verdicts or [Verdict.ACCEPTED]
 
-    # Run submission on in_path, writing stdout to out_path or stdout if out_path is None.
+    # Run submission on in_path, writing stdout to out_path.
     # args is used by SubmissionInvocation to pass on additional arguments.
     # Returns ExecResult
     # The `generator_timeout` argument is used when a submission is run as a solution when
@@ -374,10 +374,7 @@ def run(
         # Just for safety reasons, change the cwd.
         if cwd is None:
             cwd = self.tmpdir
-        with (
-            in_path.open("rb") as in_file,
-            out_path.open("wb") if out_path else nullcontext(None) as out_file,
-        ):
+        with in_path.open("rb") as in_file, out_path.open("wb") as out_file:
             # Print stderr to terminal is stdout is None, otherwise return its value.
             result = self._exec_command(
                 [*self.run_command, *args],
@@ -719,7 +716,7 @@ def test_interactive(self) -> None:
             finally:
                 os.close(r)
                 os.close(w)
-                if writer:
+                if writer is not None:
                     writer.kill()
                     writer.wait()
             bar.done()

bin/skel.py

@@ -16,6 +16,7 @@
     copytree_and_substitute,
     error,
     exec_command,
+    ExecStatus,
     fatal,
     generate_problem_uuid,
     has_ryaml,
@@ -299,7 +300,7 @@ def git(*args: str | Path) -> str:
             preexec_fn=False,
             timeout=None,
         )
-        return res.out if res and res.out else ""
+        return res.out if res.status == ExecStatus.ACCEPTED and res.out else ""
 
     if not git("rev-parse", "--is-inside-work-tree").startswith("true"):
         error("not inside git")

bin/stats.py

@@ -13,7 +13,7 @@
 import program
 import validate
 from problem import Problem
-from util import eprint, error, exec_command, glob, log, warn
+from util import eprint, error, exec_command, ExecStatus, glob, log, warn
 
 Selector = (
     str | Callable[[Problem], int | float] | list[str] | list[Callable[[set[Path]], set[str]]]
@@ -430,7 +430,7 @@ def git(*args: str | Path) -> str:
             preexec_fn=False,
             timeout=None,
         )
-        return res.out if res and res.out else ""
+        return res.out if res.status == ExecStatus.ACCEPTED and res.out else ""
 
     if not git("rev-parse", "--is-inside-work-tree").startswith("true"):
         error("not inside git")

bin/util.py

@@ -1449,7 +1449,7 @@ def interrupt_handler(sig: Any, frame: Any) -> None:
     def maybe_crop(s: str) -> str:
         return crop_output(s) if crop else s
 
-    ok = exec_code_map(process.returncode)
+    status = exec_code_map(process.returncode)
     err = maybe_crop(stderr.decode("utf-8", "replace")) if stderr is not None else None
     out = maybe_crop(stdout.decode("utf-8", "replace")) if stdout is not None else None
 
@@ -1462,7 +1462,7 @@ def maybe_crop(s: str) -> str:
     else:
         duration = tend - tstart
 
-    return ExecResult(process.returncode, ok, duration, timeout_expired, err, out)
+    return ExecResult(process.returncode, status, duration, timeout_expired, err, out)
 
 
 def inc_label(label: str) -> str: