Merge pull request #894 from eric-wieser/safe-error-page

Handle unprintable errors in default error template

1 files changed, 6 insertions, 1 deletions

diff --git a/bottle.py b/bottle.py
index e9fb826..1aa431d 100755
--- a/bottle.py
+++ b/bottle.py
@@ -4097,7 +4097,12 @@ ERROR_PAGE_TEMPLATE = """
             <pre>{{e.body}}</pre>
             %%if DEBUG and e.exception:
               <h2>Exception:</h2>
-              <pre>{{repr(e.exception)}}</pre>
+              %%try:
+                %%exc = repr(e.exception)
+              %%except:
+                %%exc = '<unprintable %%s object>' %% type(e.exception).__name__
+              %%end
+              <pre>{{exc}}</pre>
             %%end
             %%if DEBUG and e.traceback:
               <h2>Traceback:</h2>