diff --git a/core/views/expo.py b/core/views/expo.py index 1fd01e5..6b98984 100644 --- a/core/views/expo.py +++ b/core/views/expo.py @@ -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("

","

BAD NON-UTF-8 characters here - ") - html = html.replace("\\n","\n") - html = html.replace("\\t","\t") - html = html.replace("\\'","\'") - except: - return HttpResponse(default_head + '

UTF-8 Parsing Failure:
Page could not be parsed using UTF-8:
failure detected in expowebpage in views.expo.py

Please edit this :expoweb: page to replace dubious umlauts and £ symbols with correct HTML entities e.g. £;. ","

BAD NON-UTF-8 characters here - ") + # html = html.replace("\\n","\n") + # html = html.replace("\\t","\t") + # html = html.replace("\\'","\'") + # except: + # return HttpResponse(default_head + '

UTF-8 Parsing Failure:
Page could not be parsed using UTF-8:
failure detected in expowebpage in views.expo.py

Please edit this :expoweb: page to replace dubious umlauts and £ symbols with correct HTML entities e.g. &pound;;. ]*)>(.*)<\s*/head\s*>(.*)<\s*body([^>]*)>(.*)<\s*/body\s*>(.*)', html, re.DOTALL + re.IGNORECASE) if m: