]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Fixes #12637: Merged fix from 3.2 and added test.
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Mon, 25 Jul 2011 18:58:13 +0000 (19:58 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Mon, 25 Jul 2011 18:58:13 +0000 (19:58 +0100)
1  2 
Lib/logging/__init__.py
Lib/test/test_logging.py

Simple merge
index 5d84114f0cdbd8e776a87a502402f2a38be7ca10,90d293e3abe6e0fc4e1146a500d4c3e538722beb..793d29bd4726b7b804562c4c52ba609b4bfdd993
@@@ -2923,6 -2192,6 +2923,8 @@@ class LastResortTest(BaseTest)
          old_raise_exceptions = logging.raiseExceptions
          try:
              sys.stderr = sio = io.StringIO()
++            root.debug('This should not appear')
++            self.assertEqual(sio.getvalue(), '')
              root.warning('This is your final chance!')
              self.assertEqual(sio.getvalue(), 'This is your final chance!\n')
              #No handlers and no last resort, so 'No handlers' message