diff options
| author | Philip Sargent <philip.sargent@klebos.com> | 2022-04-27 23:07:02 +0300 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@klebos.com> | 2022-04-27 23:07:02 +0300 |
| commit | 362aedc2ac449bf8a76970877938bf03483c8db0 (patch) | |
| tree | 815dbae53d3fe25cf4c7c1c61b68cc20865a772a /core/views/expo.py | |
| parent | b3b10b0db709654cef135055240c5520748df07d (diff) | |
| download | troggle-362aedc2ac449bf8a76970877938bf03483c8db0.tar.gz troggle-362aedc2ac449bf8a76970877938bf03483c8db0.tar.bz2 troggle-362aedc2ac449bf8a76970877938bf03483c8db0.zip | |
back to how it was
Diffstat (limited to 'core/views/expo.py')
| -rw-r--r-- | core/views/expo.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/core/views/expo.py b/core/views/expo.py index 596052d..1fd01e5 100644 --- a/core/views/expo.py +++ b/core/views/expo.py @@ -129,15 +129,14 @@ def expowebpage(request, expowebpath, path): with open(os.path.normpath(expowebpath / path), "r") as o: html = o.read() except: - raise - # try: - # with open(os.path.normpath(expowebpath / path), "rb") as o: - # html = str(o.read()).replace("<h1>","<h1>BAD NON-UTF-8 characters here - ") - # html = html.replace("\\n","\n") - # html = html.replace("\\t","\t") - # html = html.replace("\\'","\'") - # except: - # return HttpResponse(default_head + '<h3>UTF-8 Parsing Failure:<br>Page could not be parsed using UTF-8:<br>failure detected in expowebpage in views.expo.py</h3> Please edit this <var>:expoweb:</var> page to replace dubious umlauts and £ symbols with correct HTML entities e.g. <em>&pound;;</em>. </body' ) + try: + with open(os.path.normpath(expowebpath / path), "rb") as o: + html = str(o.read()).replace("<h1>","<h1>BAD NON-UTF-8 characters here - ") + html = html.replace("\\n","\n") + html = html.replace("\\t","\t") + html = html.replace("\\'","\'") + except: + return HttpResponse(default_head + '<h3>UTF-8 Parsing Failure:<br>Page could not be parsed using UTF-8:<br>failure detected in expowebpage in views.expo.py</h3> Please edit this <var>:expoweb:</var> page to replace dubious umlauts and £ symbols with correct HTML entities e.g. <em>&pound;;</em>. </body' ) m = re.search(r'(.*)<\s*head([^>]*)>(.*)<\s*/head\s*>(.*)<\s*body([^>]*)>(.*)<\s*/body\s*>(.*)', html, re.DOTALL + re.IGNORECASE) if m: |