aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar MarkKoz <[email protected]>2019-06-29 14:28:01 -0700
committerGravatar MarkKoz <[email protected]>2019-06-29 14:28:01 -0700
commitd4fde673ec54b2d1a1706c99aab93ec03db6e602 (patch)
tree20c732b8e952fdae9d40110715ac8e2d50dc9d88
parentTest that the file system is mounted as read only (diff)
Use write_text() and fix codec names
-rw-r--r--snekbox/nsjail.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/snekbox/nsjail.py b/snekbox/nsjail.py
index 1ca3762..d980f09 100644
--- a/snekbox/nsjail.py
+++ b/snekbox/nsjail.py
@@ -68,13 +68,11 @@ class NsJail:
# Swap limit cannot be set to a value lower than memory.limit_in_bytes.
# Therefore, this must be set first.
- with (mem / "memory.limit_in_bytes").open("w", encoding="utf=8") as f:
- f.write(str(MEM_MAX))
+ (mem / "memory.limit_in_bytes").write_text(str(MEM_MAX), encoding="utf-8")
try:
# Swap limit is specified as the sum of the memory and swap limits.
- with (mem / "memory.memsw.limit_in_bytes").open("w", encoding="utf=8") as f:
- f.write(str(MEM_MAX))
+ (mem / "memory.memsw.limit_in_bytes").write_text(str(MEM_MAX), encoding="utf-8")
except PermissionError:
log.warning(
"Failed to set the memory swap limit for the cgroup. "
@@ -152,7 +150,7 @@ class NsJail:
except ValueError:
return CompletedProcess(args, None, "ValueError: embedded null byte", None)
- log_lines = nsj_log.read().decode("UTF-8").splitlines()
+ log_lines = nsj_log.read().decode("utf-8").splitlines()
if not log_lines and result.returncode == 255:
# NsJail probably failed to parse arguments so log output will still be in stdout
log_lines = result.stdout.splitlines()