Merged revisions 66337,66347,66350,66352,66358 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66337 | vinay.sajip | 2008-09-09 08:42:08 -0500 (Tue, 09 Sep 2008) | 1 line
Issue #3809: Fixed spurious 'test.blah' file left behind by test_logging.
........
r66347 | georg.brandl | 2008-09-09 14:26:00 -0500 (Tue, 09 Sep 2008) | 2 lines
Fix varname in docstring. #3822.
........
r66350 | georg.brandl | 2008-09-09 15:28:31 -0500 (Tue, 09 Sep 2008) | 2 lines
#3472: update Mac-bundled Python version info.
........
r66352 | benjamin.peterson | 2008-09-09 15:55:01 -0500 (Tue, 09 Sep 2008) | 4 lines
Fix #3634 invalid return value from _weakref.ref(Exception).__init__
Reviewers: Amaury, Antoine, Benjamin
........
r66358 | benjamin.peterson | 2008-09-09 18:16:48 -0500 (Tue, 09 Sep 2008) | 1 line
use the latest pygments version
........
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
index 75d1366..c99a650 100644
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -615,10 +615,10 @@
args=(sys.stdout,)
[handler_hand2]
- class=FileHandler
+ class=StreamHandler
level=NOTSET
formatter=form1
- args=('test.blah', 'a')
+ args=(sys.stderr,)
[formatter_form1]
format=%(levelname)s ++ %(message)s