diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 19b96b813cf..b941eab97d6 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -1739,6 +1739,27 @@ class LoggerAdapter(object): """ return self.logger.hasHandlers() + def _log(self, level, msg, args, exc_info=None, extra=None, stack_info=False): + """ + Low-level log implementation, proxied to allow nested logger adapters. + """ + return self.logger._log( + level, + msg, + args, + exc_info=exc_info, + extra=extra, + stack_info=stack_info, + ) + + @property + def manager(self): + return self.logger.manager + + @manager.setter + def set_manager(self, value): + self.logger.manager = value + def __repr__(self): logger = self.logger level = getLevelName(logger.getEffectiveLevel()) diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 76f98bb572d..611044d8fa8 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -3986,6 +3986,17 @@ class LoggerAdapterTest(unittest.TestCase): self.assertFalse(self.logger.hasHandlers()) self.assertFalse(self.adapter.hasHandlers()) + def test_nested(self): + msg = 'Adapters can be nested, yo.' + adapter_adapter = logging.LoggerAdapter(logger=self.adapter, extra=None) + adapter_adapter.log(logging.CRITICAL, msg, self.recording) + + self.assertEqual(len(self.recording.records), 1) + record = self.recording.records[0] + self.assertEqual(record.levelno, logging.CRITICAL) + self.assertEqual(record.msg, msg) + self.assertEqual(record.args, (self.recording,)) + class LoggerTest(BaseTest): diff --git a/Misc/NEWS.d/next/Library/2017-09-13-13-33-39.bpo-31457.bIVBtI.rst b/Misc/NEWS.d/next/Library/2017-09-13-13-33-39.bpo-31457.bIVBtI.rst new file mode 100644 index 00000000000..153aa42a62e --- /dev/null +++ b/Misc/NEWS.d/next/Library/2017-09-13-13-33-39.bpo-31457.bIVBtI.rst @@ -0,0 +1 @@ +LoggerAdapter objects can now be nested.