homepage

If cgitb.enable is ran with a logdir set and a format='text' argument, then a trailing message is printed that includes <p> tags. This should only happen if the format requested is HTML.
The following tiny script shows the problem:
import cgitb
cgitb.enable(format='text', logdir='/tmp')
1/0
Attaching a small patch which addresses. This is against tip on the default branch.
mcjeff@macbook:~/cpython$ ./python.exe --version
Python 3.3.0a0

Is there anything else needed here?

A test?

I didn't add one initially as I was just changing output format and not actual behavior. I guess I could add something to ensure it doesn't regress? I'll make sure there's coverage to begin with.

Test to ensure html isn't included when the formatting is text. I don't seem to be able to update the stage.

Thanks for the updated patch. I made a review, you should have received an email. When you make a new patch, it would be most helpful if you could make one patch with code and tests changes, and then we’ll remove the old versions.

Added everything to one file. Updated tests to also include a logdir argument as that is required to trigger the original bug. Weeded out a spurious write that occurred when format was set to text.

Latest patch is good to go.

Did this ever get committed? Is there anything left for me to do here?

I’ll apply it shortly.

What about closing the </p> too (see attached patch)?
(I know the </p> is not necessary, but I prefer to add it.)

New changeset 715e5b337c91 by R David Murray in branch '2.7':
#12890: don't emit <p> tags in text mode when logdir specified.
http://hg.python.org/cpython/rev/715e5b337c91
New changeset abbfb89055d3 by R David Murray in branch '3.2':
#12890: don't emit <p> tags in text mode when logdir specified.
http://hg.python.org/cpython/rev/abbfb89055d3
New changeset 45764e4bb504 by R David Murray in branch '3.3':
merge #12890: don't emit <p> tags in text mode when logdir specified.
http://hg.python.org/cpython/rev/45764e4bb504
New changeset b21c28258d3c by R David Murray in branch 'default':
merge #12890: don't emit <p> tags in text mode when logdir specified.
http://hg.python.org/cpython/rev/b21c28258d3c 

Committed with Ezio's <\p> and with simplification of the tests by using script_helper. Thanks, Jeff!

The tests fail on Widows7 on the buildbots. (They work fine in my XP Windows VM.)

New changeset 0e4574595674 by R David Murray in branch '3.3':
#12890: skip tests which fail on windows until fixed or rewritten.
http://hg.python.org/cpython/rev/0e4574595674
New changeset 57a33af85407 by R David Murray in branch 'default':
merge #12890: skip tests which fail on windows until fixed or rewritten.
http://hg.python.org/cpython/rev/57a33af85407 

I put in a skip until we either fix the tests or rewrite them as suggested in issue 15749.

Uploaded a patch which fixes the failing on Windows 7.
It was essentially an issue with the Windows path returned by temp_dir() containing unescaped backslashes. A repr() fixed this.

Patch successfully tested on Mac OSX 10.8. No regressions.

Patch (p12890-2.diff) successfully tested on Windows 7 64. No regressions.

New changeset 7648b7ed6d91 by R David Murray in branch '3.3':
#12890: fix test on windows
http://hg.python.org/cpython/rev/7648b7ed6d91
New changeset d24befb680d6 by R David Murray in branch 'default':
#12890: fix test on windows
http://hg.python.org/cpython/rev/d24befb680d6 

Thanks everyone.