diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/utils.py | 1 | ||||
| -rw-r--r-- | core/views/caves.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/core/utils.py b/core/utils.py index 924dac3..c9afdd5 100644 --- a/core/utils.py +++ b/core/utils.py @@ -6,6 +6,7 @@ import resource import random import logging import subprocess +from pathlib import Path from urllib.parse import urljoin from decimal import Decimal, getcontext diff --git a/core/views/caves.py b/core/views/caves.py index 018a557..edf5c4a 100644 --- a/core/views/caves.py +++ b/core/views/caves.py @@ -345,7 +345,7 @@ def edit_cave(request, slug=None): except PermissionError: message = f'CANNOT save this file.\nPERMISSIONS incorrectly set on server for this file {cave.filename}. Ask a nerd to fix this.' return render(request,'errors/generic.html', {'message': message}) - except SubprocessError: + except subprocess.SubprocessError: message = f'CANNOT git on server for this file {cave.filename}. Edits may not be committed.\nAsk a nerd to fix this.' return render(request,'errors/generic.html', {'message': message}) @@ -415,7 +415,7 @@ def edit_entrance(request, caveslug=None, slug=None): except PermissionError: message = f'CANNOT save this file.\nPERMISSIONS incorrectly set on server for this file {entrance.filename}. Ask a nerd to fix this.' return render(request,'errors/generic.html', {'message': message}) - except SubprocessError: + except subprocess.SubprocessError: message = f'CANNOT git on server for this file {entrance.filename}. Edits may not be committed.\nAsk a nerd to fix this.' return render(request,'errors/generic.html', {'message': message}) |