|
1 | 1 | from __future__ import annotations
|
2 | 2 |
|
| 3 | +import contextlib |
3 | 4 | import logging
|
4 | 5 | import os
|
5 | 6 | import re
|
@@ -42,12 +43,12 @@ def run_submission(submission_id):
|
42 | 43 | )
|
43 | 44 | submission_path = submission.file_path
|
44 | 45 |
|
45 |
| - submission_wrapper_path = Path(submission.wrapper_file_path) |
| 46 | + submission_wrapper_path = submission.wrapper_file_path |
46 | 47 |
|
47 | 48 | args = get_assignment_sandbox_args(
|
48 |
| - ["mkdir", "-p", "--", str(submission_wrapper_path.parent)], |
| 49 | + ["mkdir", "-p", "--", os.path.dirname(submission_wrapper_path)], |
49 | 50 | network_access=False,
|
50 |
| - whitelist=[str(submission_wrapper_path.parent.parent)], |
| 51 | + whitelist=[os.path.dirname(os.path.dirname(submission_wrapper_path))], |
51 | 52 | )
|
52 | 53 |
|
53 | 54 | try:
|
@@ -100,8 +101,9 @@ def run_submission(submission_id):
|
100 | 101 | python=python_exe,
|
101 | 102 | )
|
102 | 103 |
|
103 |
| - submission_wrapper_path.write_text(wrapper_text, "utf-8") |
104 |
| - submission_wrapper_path.chmod(0o700) |
| 104 | + with open(submission_wrapper_path, "w", encoding="utf-8") as f: |
| 105 | + f.write(wrapper_text) |
| 106 | + os.chmod(submission_wrapper_path, 0o700) |
105 | 107 | except OSError:
|
106 | 108 | submission.grader_output = (
|
107 | 109 | "An internal error occurred. Please try again.\n"
|
@@ -129,15 +131,15 @@ def run_submission(submission_id):
|
129 | 131 | python_exe,
|
130 | 132 | "-u",
|
131 | 133 | grader_path,
|
132 |
| - str(submission_wrapper_path), |
| 134 | + submission_wrapper_path, |
133 | 135 | submission_path,
|
134 | 136 | submission.student.username,
|
135 | 137 | grader_log_path,
|
136 | 138 | ]
|
137 | 139 |
|
138 | 140 | if settings.USE_SANDBOXING:
|
139 | 141 | whitelist = [os.path.dirname(grader_path)]
|
140 |
| - read_only = [grader_path, submission_path, str(submission_wrapper_path.parent)] |
| 142 | + read_only = [grader_path, submission_path, os.path.dirname(submission_wrapper_path)] |
141 | 143 | if submission.assignment.venv_fully_created:
|
142 | 144 | whitelist.append(submission.assignment.venv.path)
|
143 | 145 | read_only.append(submission.assignment.venv.path)
|
@@ -278,4 +280,5 @@ def run_submission(submission_id):
|
278 | 280 | submission.channel_group_name, {"type": "submission.updated"}
|
279 | 281 | )
|
280 | 282 |
|
281 |
| - submission_wrapper_path.unlink(missing_ok=True) |
| 283 | + with contextlib.suppress(FileNotFoundError): |
| 284 | + os.unlink(submission_wrapper_path) |
0 commit comments