commit 07ad02f62cc336772e12e3fd837579952b03ca57
author Serhiy Storchaka <storchaka@gmail.com> Mon Apr 30 11:34:47 2018 +0300
committer GitHub <noreply@github.com> Mon Apr 30 11:34:47 2018 +0300
tree 0161454085b770379dad5ed68405b395dd5fb032
parent 07c3a612c7c17f96bad56f450c0168a5b7dde61c

[2.7] bpo-33256: Replace angle brackets around python object repr to display it in html (GH-6442). (GH-6650)

(cherry picked from commit 7d68bfa82654ba01d860b8a772ff63bf0bd183ee)

Co-authored-by: sblondon <sblondon@users.noreply.github.com>

Lib/cgitb.py

diff --git a/Lib/cgitb.py b/Lib/cgitb.py
index 8acc4b7..3689f8a 100644
--- a/Lib/cgitb.py
+++ b/Lib/cgitb.py
@@ -125,7 +125,7 @@
         args, varargs, varkw, locals = inspect.getargvalues(frame)
         call = ''
         if func != '?':
-            call = 'in ' + strong(func) + \
+            call = 'in ' + strong(pydoc.html.escape(func)) + \
                 inspect.formatargvalues(args, varargs, varkw, locals,
                     formatvalue=lambda value: '=' + pydoc.html.repr(value))
 
@@ -285,7 +285,7 @@
 
         if self.display:
             if plain:
-                doc = doc.replace('&', '&amp;').replace('<', '&lt;')
+                doc = pydoc.html.escape(doc)
                 self.file.write('<pre>' + doc + '</pre>\n')
             else:
                 self.file.write(doc + '\n')