diff options
| author | Benjamin Peterson <benjamin@python.org> | 2008-09-10 21:57:34 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2008-09-10 21:57:34 (GMT) |
| commit | 9aa4299882500ca3206514bced135c0a1083355d (patch) | |
| tree | 2a224e759cc42db9cfb80d0d96e630f0c29e9db3 /Lib | |
| parent | 5e19e4441335a70c9087402e9c487b66c9daca94 (diff) | |
| download | cpython-9aa4299882500ca3206514bced135c0a1083355d.zip cpython-9aa4299882500ca3206514bced135c0a1083355d.tar.gz cpython-9aa4299882500ca3206514bced135c0a1083355d.tar.bz2 | |
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
........
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/test/test_logging.py | 4 | ||||
| -rw-r--r-- | Lib/test/test_weakref.py | 8 |
2 files changed, 10 insertions, 2 deletions
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 @@ class ConfigFileTest(BaseTest): 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 diff --git a/Lib/test/test_weakref.py b/Lib/test/test_weakref.py index 108cd7f..9821e1b 100644 --- a/Lib/test/test_weakref.py +++ b/Lib/test/test_weakref.py @@ -660,6 +660,14 @@ class ReferencesTestCase(TestBase): w = Target() + def test_init(self): + # Issue 3634 + # <weakref to class>.__init__() doesn't check errors correctly + r = weakref.ref(Exception) + self.assertRaises(TypeError, r.__init__, 0, 0, 0, 0, 0) + # No exception should be raised here + gc.collect() + class SubclassableWeakrefTestCase(TestBase): |