From 252cd0e4e0b11c7d13e24146617ad48e80feca43 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Sat, 27 Oct 2012 14:42:47 -0400 Subject: #12890: don't emit

tags in text mode when logdir specified. Patch by Jeff McNeil. --- Lib/cgitb.py | 11 ++++++++--- Misc/ACKS | 1 + Misc/NEWS | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Lib/cgitb.py b/Lib/cgitb.py index 7b52c8e..6da40e8 100644 --- a/Lib/cgitb.py +++ b/Lib/cgitb.py @@ -293,14 +293,19 @@ class Hook: if self.logdir is not None: suffix = ['.txt', '.html'][self.format=="html"] (fd, path) = tempfile.mkstemp(suffix=suffix, dir=self.logdir) + try: file = os.fdopen(fd, 'w') file.write(doc) file.close() - msg = '

%s contains the description of this error.' % path + msg = '%s contains the description of this error.' % path except: - msg = '

Tried to save traceback to %s, but failed.' % path - self.file.write(msg + '\n') + msg = 'Tried to save traceback to %s, but failed.' % path + + if self.format == 'html': + self.file.write('

%s

\n' % msg) + else: + self.file.write(msg + '\n') try: self.file.flush() except: pass diff --git a/Misc/ACKS b/Misc/ACKS index 182c6a6..2b97f51 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -699,6 +699,7 @@ Mark Mc Mahon Gordon McMillan Caolan McNamara Andrew McNamara +Jeff McNeil Craig McPheeters Lambert Meertens Bill van Melle diff --git a/Misc/NEWS b/Misc/NEWS index a7af2cc..5010f70 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -132,6 +132,9 @@ Core and Builtins Library ------- +- Issue #12890: cgitb no longer prints spurious

tags in text + mode when the logdir option is specified. + - Issue #16250: Fix URLError invocation with proper args. - Issue #16305: Fix a segmentation fault occurring when interrupting -- cgit v0.12