diff options
| -rw-r--r-- | Lib/cgitb.py | 11 | ||||
| -rw-r--r-- | Misc/ACKS | 1 | ||||
| -rw-r--r-- | 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 = '<p> %s contains the description of this error.' % path + msg = '%s contains the description of this error.' % path except: - msg = '<p> 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('<p>%s</p>\n' % msg) + else: + self.file.write(msg + '\n') try: self.file.flush() except: pass @@ -699,6 +699,7 @@ Mark Mc Mahon Gordon McMillan Caolan McNamara Andrew McNamara +Jeff McNeil Craig McPheeters Lambert Meertens Bill van Melle @@ -132,6 +132,9 @@ Core and Builtins Library ------- +- Issue #12890: cgitb no longer prints spurious <p> 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 |