From: R David Murray Date: Sat, 27 Oct 2012 18:42:36 +0000 (-0400) Subject: #12890: don't emit

tags in text mode when logdir specified. X-Git-Tag: v2.7.5~109^2~193 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54eed2e36d2c8e06ce1f1a30a3979587a3ac1af6;p=python #12890: don't emit

tags in text mode when logdir specified. Patch by Jeff McNeil. --- diff --git a/Lib/cgitb.py b/Lib/cgitb.py index 5becdf3653..8acc4b75fe 100644 --- a/Lib/cgitb.py +++ b/Lib/cgitb.py @@ -295,14 +295,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 ba6be3ca68..9211e637f3 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -644,6 +644,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 216346e4a4..8df6477c40 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -122,6 +122,9 @@ Core and Builtins Library ------- +- Issue #12890: cgitb no longer prints spurious

tags in text + mode when the logdir option is specified. + - Issue #14398: Fix size truncation and overflow bugs in the bz2 module. - Issue #5148: Ignore 'U' in mode given to gzip.open() and gzip.GzipFile().