Compatibility with python3.5, remove sandbox on keyboard interrupt

2 files changed, 13 insertions, 10 deletions

diff --git a/main.py b/main.py
index 97f4702..85111c0 100755
--- a/main.py
+++ b/main.py
@@ -2,15 +2,19 @@
 
 import sys
 import argparse
+import shutil
 
 import utils
 import config
 import suites
 
 def main():
-    suites.suite_quote()
-    suites.suite_echo()
-    suites.suite_redirection()
+    try:
+        suites.suite_quote()
+        suites.suite_echo()
+        suites.suite_redirection()
+    except KeyboardInterrupt:
+        shutil.rmtree(config.SANDBOX_PATH)
 
 
 if __name__ == "__main__":
diff --git a/utils.py b/utils.py
index fac97db..9ce5e62 100644
--- a/utils.py
+++ b/utils.py
@@ -77,25 +77,25 @@ def run_sandboxed(program: str, cmd: str, setup: str = None, files: [str] = [])
         pass
     if setup is not None:
         try:
-            setup_status = subprocess.run(setup, shell=True, cwd=config.SANDBOX_PATH, check=True, text=True, capture_output=True)
+            setup_status = subprocess.run(setup, shell=True, cwd=config.SANDBOX_PATH, check=True)
         except subprocess.CalledProcessError as e:
-            print("Error: `{}` setup command failed for `{}`\n\twith '{}'".format(setup, cmd, e.stderr.strip()))
+            print("Error: `{}` setup command failed for `{}`\n\twith '{}'"
+                  .format(setup, cmd, e.stderr.decode().strip()))
             sys.exit(1)
 
     # TODO: add timeout
     # https://docs.python.org/3/library/subprocess.html#using-the-subprocess-module
     process_status = subprocess.run([program, "-c", cmd],
-                                    text=True,
                                     stderr=subprocess.STDOUT,
                                     stdout=subprocess.PIPE,
                                     cwd=config.SANDBOX_PATH)
-    output = process_status.stdout
+    output = process_status.stdout.decode()
 
     output_files = []
     for file_name in files:
         try:
-            with open(os.path.join(config.SANDBOX_PATH, file_name), "r") as f:
-                output_files.append(f.read())
+            with open(os.path.join(config.SANDBOX_PATH, file_name), "rb") as f:
+                output_files.append(f.read().decode())
         except FileNotFoundError as e:
             output_files.append(None)
 
@@ -148,4 +148,3 @@ def suite(origin):
         origin()
         print()
     return f
-