mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-18 04:38:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

bpo-36015: Handle StreamHandler representaton of stream with an integer name (GH-11908)

Browse source
This commit is contained in:
Riccardo Magliocchetti 2019-05-07 23:36:39 +02:00 • committed by Vinay Sajip
parent 3918ad6b45
commit ca87eebb22
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/logging/__init__.py
View file

@ -1111,6 +1111,8 @@ class StreamHandler(Handler):
def __repr__(self): def __repr__(self):
level = getLevelName(self.level) level = getLevelName(self.level)
name = getattr(self.stream, 'name', '') name = getattr(self.stream, 'name', '')
# bpo-36015: name can be an int
name = str(name)
if name: if name:
name += ' ' name += ' '
return '<%s %s(%s)>' % (self.__class__.__name__, name, level) return '<%s %s(%s)>' % (self.__class__.__name__, name, level)

8
Lib/test/test_logging.py
View file

@ -760,6 +760,10 @@ class TestStreamHandler(logging.StreamHandler):
def handleError(self, record): def handleError(self, record):
self.error_record = record self.error_record = record
class StreamWithIntName(object):
level = logging.NOTSET
name = 2
class StreamHandlerTest(BaseTest): class StreamHandlerTest(BaseTest):
def test_error_handling(self): def test_error_handling(self):
h = TestStreamHandler(BadStream()) h = TestStreamHandler(BadStream())
@ -797,6 +801,10 @@ class StreamHandlerTest(BaseTest):
actual = h.setStream(old) actual = h.setStream(old)
self.assertIsNone(actual) self.assertIsNone(actual)
def test_can_represent_stream_with_int_name(self):
h = logging.StreamHandler(StreamWithIntName())
self.assertEqual(repr(h), '<StreamHandler 2 (NOTSET)>')
# -- The following section could be moved into a server_helper.py module # -- The following section could be moved into a server_helper.py module
# -- if it proves to be of wider utility than just test_logging # -- if it proves to be of wider utility than just test_logging