diff --git a/core/views/expo.py b/core/views/expo.py index 3c092bb..1fd01e5 100644 --- a/core/views/expo.py +++ b/core/views/expo.py @@ -130,18 +130,13 @@ def expowebpage(request, expowebpath, path): html = o.read() except: try: - with open(os.path.normpath(expowebpath / path), "r", encoding='iso-8859-1') as o: - html = o.read() - html = str(o.read()).replace("<h1>","<h1>ISO-8859-1 characters here - ") + 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: - 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' ) + 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: