From a664e8ce8ccc6ab620d537e68aa8d6d067d6ef9e Mon Sep 17 00:00:00 2001 From: Martin Green Date: Mon, 20 Jun 2022 21:35:51 +0100 Subject: Made it such that opening files for reading and writing when editing to use utf8 encoding --- core/views/expo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/views/expo.py') diff --git a/core/views/expo.py b/core/views/expo.py index 3c60e92..5c0549f 100644 --- a/core/views/expo.py +++ b/core/views/expo.py @@ -283,7 +283,7 @@ def editexpopage(request, path): try: filepath = Path(settings.EXPOWEB) / path o = open(os.path.normpath(filepath).encode(sysdefaultencoding), "r") - html = o.read() + html = o.read(encoding="utf8") autogeneratedmatch = re.search(r"\<\!--\s*(.*?(Do not edit|It is auto-generated).*?)\s*--\>", html, re.DOTALL + re.IGNORECASE) if autogeneratedmatch: return HttpResponse(autogeneratedmatch.group(1)) @@ -331,7 +331,7 @@ def editexpopage(request, path): # GIT see also core/models/cave.py writetrogglefile() # GIT see also core/views/uploads.py dwgupload() try: - with open(os.path.normpath(filepath).encode(sysdefaultencoding), "w") as f: + with open(os.path.normpath(filepath).encode(sysdefaultencoding), "w", encoding="utf8") as f: print(f'WRITING{cwd}---{filename} ') # as the wsgi process www-data, we have group write-access but are not owner, so cannot chmod. # os.chmod(filepath, 0o664) # set file permissions to rw-rw-r-- -- cgit v1.2.3