From 8cf4b34b3665b8bb39ea7111e6b5c3410899d3e4 Mon Sep 17 00:00:00 2001
From: sblondon <sblondon@users.noreply.github.com>
Date: Wed, 9 May 2018 11:39:32 +0200
Subject: [PATCH] bpo-33311: Do not display parameters displayed in parentheses
for module call. (GH-6677)
---
Lib/cgitb.py | 10 ++++++----
.../Library/2018-05-01-22-33-14.bpo-33311.8YPB-k.rst | 2 ++
2 files changed, 8 insertions(+), 4 deletions(-)
create mode 100644 Misc/NEWS.d/next/Library/2018-05-01-22-33-14.bpo-33311.8YPB-k.rst
diff --git a/Lib/cgitb.py b/Lib/cgitb.py
index 0f5f32c0fa..4f81271be3 100644
--- a/Lib/cgitb.py
+++ b/Lib/cgitb.py
@@ -124,8 +124,9 @@ function calls leading up to the error, in the order they occurred.</p>'''
args, varargs, varkw, locals = inspect.getargvalues(frame)
call = ''
if func != '?':
- call = 'in ' + strong(pydoc.html.escape(func)) + \
- inspect.formatargvalues(args, varargs, varkw, locals,
+ call = 'in ' + strong(pydoc.html.escape(func))
+ if func != "<module>":
+ call += inspect.formatargvalues(args, varargs, varkw, locals,
formatvalue=lambda value: '=' + pydoc.html.repr(value))
highlight = {}
@@ -207,8 +208,9 @@ function calls leading up to the error, in the order they occurred.
args, varargs, varkw, locals = inspect.getargvalues(frame)
call = ''
if func != '?':
- call = 'in ' + func + \
- inspect.formatargvalues(args, varargs, varkw, locals,
+ call = 'in ' + func
+ if func != "<module>":
+ call += inspect.formatargvalues(args, varargs, varkw, locals,
formatvalue=lambda value: '=' + pydoc.text.repr(value))
highlight = {}
diff --git a/Misc/NEWS.d/next/Library/2018-05-01-22-33-14.bpo-33311.8YPB-k.rst b/Misc/NEWS.d/next/Library/2018-05-01-22-33-14.bpo-33311.8YPB-k.rst
new file mode 100644
index 0000000000..d0218de373
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-05-01-22-33-14.bpo-33311.8YPB-k.rst
@@ -0,0 +1,2 @@
+Text and html output generated by cgitb does not display parentheses if the
+current call is done directly in the module. Patch by Stéphane Blondon.
--
2.40.0