diff options
| author | Philip Sargent <philip.sargent@klebos.com> | 2022-04-27 23:43:15 +0300 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@klebos.com> | 2022-04-27 23:43:15 +0300 |
| commit | 322d454d415b4dcb56e1563002fd9a26f08be480 (patch) | |
| tree | 815dbae53d3fe25cf4c7c1c61b68cc20865a772a | |
| parent | cafde67c026809ed73cec9eae6deb0f4921cb0d0 (diff) | |
| download | troggle-322d454d415b4dcb56e1563002fd9a26f08be480.tar.gz troggle-322d454d415b4dcb56e1563002fd9a26f08be480.tar.bz2 troggle-322d454d415b4dcb56e1563002fd9a26f08be480.zip | |
revert
| -rw-r--r-- | core/views/expo.py | 17 |
1 files changed, 6 insertions, 11 deletions
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: |