SF patch #687683, Patches to logging (updates from Vinay)
Mostly rename WARN -> WARNING
Other misc tweaks
Update tests (not in original patch)
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 113df5c..9c47408 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -342,15 +342,16 @@
def test2():
logger = logging.getLogger("")
sh = logger.handlers[0]
+ sh.close()
logger.removeHandler(sh)
- mh = logging.handlers.MemoryHandler(10,logging.WARN, sh)
+ mh = logging.handlers.MemoryHandler(10,logging.WARNING, sh)
logger.setLevel(logging.DEBUG)
logger.addHandler(mh)
message("-- logging at DEBUG, nothing should be seen yet --")
logger.debug("Debug message")
message("-- logging at INFO, nothing should be seen yet --")
logger.info("Info message")
- message("-- logging at WARN, 3 messages should be seen --")
+ message("-- logging at WARNING, 3 messages should be seen --")
logger.warn("Warn message")
for i in xrange(102):
message(MSG % i)
@@ -436,6 +437,7 @@
rootLogger.addHandler(hdlr)
test0()
+ hdlr.close()
rootLogger.removeHandler(hdlr)
banner("log_test0", "end")