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

miss-islington · xrmx · vsajip · commit 78dd781ef4d4 · 2019-05-15T19:06:29.000+01:00
(cherry picked from commit ca87eeb) Co-authored-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
@@ -1055,6 +1055,8 @@ def setStream(self, stream):
     def __repr__(self):
         level = getLevelName(self.level)
         name = getattr(self.stream, 'name', '')
+        #  bpo-36015: name can be an int
+        name = str(name)
         if name:
             name += ' '
         return '<%s %s(%s)>' % (self.__class__.__name__, name, level)
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
@@ -766,6 +766,10 @@ class TestStreamHandler(logging.StreamHandler):
     def handleError(self, record):
         self.error_record = record
 
+class StreamWithIntName(object):
+    level = logging.NOTSET
+    name = 2
+
 class StreamHandlerTest(BaseTest):
     def test_error_handling(self):
         h = TestStreamHandler(BadStream())
@@ -803,6 +807,10 @@ def test_stream_setting(self):
         actual = h.setStream(old)
         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
 # -- if it proves to be of wider utility than just test_logging
 
