summaryrefslogtreecommitdiffstats
path: root/core/views/expo.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@gmail.com>2022-03-30 23:53:57 +0100
committerPhilip Sargent <philip.sargent@gmail.com>2022-03-30 23:53:57 +0100
commitd7246cbb981a47ac5e6229ec3caa51116a09d7eb (patch)
tree8372724603fb8179c426b2789c13f5630034f84a /core/views/expo.py
parent785500241ea752a17fe66d1f8637518ce26283b7 (diff)
downloadtroggle-d7246cbb981a47ac5e6229ec3caa51116a09d7eb.tar.gz
troggle-d7246cbb981a47ac5e6229ec3caa51116a09d7eb.tar.bz2
troggle-d7246cbb981a47ac5e6229ec3caa51116a09d7eb.zip
UTF-8 failure thing
Diffstat (limited to 'core/views/expo.py')
-rw-r--r--core/views/expo.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/views/expo.py b/core/views/expo.py
index 0fc86e2..0ce7cdc 100644
--- a/core/views/expo.py
+++ b/core/views/expo.py
@@ -129,7 +129,11 @@ def expowebpage(request, expowebpath, path):
with open(os.path.normpath(expowebpath / path), "r") as o:
html = o.read()
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' )
+ try:
+ with open(os.path.normpath(expowebpath / path), "rb") as o:
+ html = o.read()
+ 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: