python · serhiy-storchaka · Apr 30, 2018 · Apr 29, 2018
diff --git a/Lib/cgitb.py b/Lib/cgitb.py
@@ -125,7 +125,7 @@ def html(einfo, context=5):
        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 @@ def handle(self, info=None):

        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')

diff --git a/Misc/ACKS b/Misc/ACKS
@@ -138,6 +138,7 @@ Mike Bland
 Martin Bless
 Pablo Bleyer
 Erik van Blokland
+Stéphane Blondon
 Eric Blossom
 Sergey Bobrov
 Finn Bock

diff --git a/Misc/NEWS.d/next/Library/2018-04-10-20-57-14.bpo-33256.ndHkqu.rst b/Misc/NEWS.d/next/Library/2018-04-10-20-57-14.bpo-33256.ndHkqu.rst
@@ -0,0 +1 @@
+Fix display of ``<module>`` call in the html produced by ``cgitb.html()``. Patch by Stéphane Blondon.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix display of ``<module>`` call in the html produced by ``cgitb.html()``. Patch by Stéphane Blondon.