Merge with 3.2.

This commit is contained in:
Ezio Melotti 2011-07-14 15:57:12 +03:00
commit e73d49d328

View file

@ -155,7 +155,13 @@ class CgiTests(unittest.TestCase):
cgi.logfp = None cgi.logfp = None
cgi.logfile = "/dev/null" cgi.logfile = "/dev/null"
cgi.initlog("%s", "Testing log 3") cgi.initlog("%s", "Testing log 3")
self.addCleanup(cgi.logfp.close) def log_cleanup():
"""Restore the global state of the log vars."""
cgi.logfile = ''
cgi.logfp.close()
cgi.logfp = None
cgi.log = cgi.initlog
self.addCleanup(log_cleanup)
cgi.log("Testing log 4") cgi.log("Testing log 4")
def test_fieldstorage_readline(self): def test_fieldstorage_readline(self):