Commit e69fdc7d authored by Vinay Sajip's avatar Vinay Sajip

Merged fix for #13361 from 3.2.

parents a8b3fcc7 3084d417
...@@ -1096,6 +1096,8 @@ class Manager(object): ...@@ -1096,6 +1096,8 @@ class Manager(object):
placeholder to now point to the logger. placeholder to now point to the logger.
""" """
rv = None rv = None
if not isinstance(name, str):
raise ValueError('A logger name must be a string')
_acquireLock() _acquireLock()
try: try:
if name in self.loggerDict: if name in self.loggerDict:
......
...@@ -310,6 +310,8 @@ class BuiltinLevelsTest(BaseTest): ...@@ -310,6 +310,8 @@ class BuiltinLevelsTest(BaseTest):
('INF.BADPARENT', 'INFO', '4'), ('INF.BADPARENT', 'INFO', '4'),
]) ])
def test_invalid_name(self):
self.assertRaises(ValueError, logging.getLogger, any)
class BasicFilterTest(BaseTest): class BasicFilterTest(BaseTest):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment