2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 15:21:52 +00:00

raise exception on live system

This commit is contained in:
Philip Sargent 2022-04-27 22:58:43 +03:00
parent 3bd308effa
commit 3528587890

View File

@ -128,15 +128,15 @@ def expowebpage(request, expowebpath, path):
try:
with open(os.path.normpath(expowebpath / path), "r") as o:
html = o.read()
except:
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 &pound; symbols with correct HTML entities e.g. <em>&amp;pound;;</em>. </body' )
# except:
# 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 &pound; symbols with correct HTML entities e.g. <em>&amp;pound;;</em>. </body' )
m = re.search(r'(.*)<\s*head([^>]*)>(.*)<\s*/head\s*>(.*)<\s*body([^>]*)>(.*)<\s*/body\s*>(.*)', html, re.DOTALL + re.IGNORECASE)
if m: