2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-29 13:21:54 +00:00

back to how it was

This commit is contained in:
Philip Sargent 2022-04-27 23:07:02 +03:00
parent b3b10b0db7
commit 362aedc2ac

View File

@ -129,15 +129,14 @@ def expowebpage(request, expowebpath, path):
with open(os.path.normpath(expowebpath / path), "r") as o: with open(os.path.normpath(expowebpath / path), "r") as o:
html = o.read() html = o.read()
except: except:
raise try:
# try: with open(os.path.normpath(expowebpath / path), "rb") as o:
# with open(os.path.normpath(expowebpath / path), "rb") as o: html = str(o.read()).replace("<h1>","<h1>BAD NON-UTF-8 characters here - ")
# html = str(o.read()).replace("<h1>","<h1>BAD NON-UTF-8 characters here - ") html = html.replace("\\n","\n")
# html = html.replace("\\n","\n") html = html.replace("\\t","\t")
# html = html.replace("\\t","\t") html = html.replace("\\'","\'")
# html = html.replace("\\'","\'") except:
# 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' )
# 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) m = re.search(r'(.*)<\s*head([^>]*)>(.*)<\s*/head\s*>(.*)<\s*body([^>]*)>(.*)<\s*/body\s*>(.*)', html, re.DOTALL + re.IGNORECASE)
if m: if m: