bpo-31457: Make the `LoggerAdapter.manager` property settable (#4042)

Due to a bug in the initial fix, the setter was in fact creating a different
property.  This is now fixed.
This commit is contained in:
Łukasz Langa 2017-10-18 17:28:51 -07:00 committed by GitHub
parent 032a6480e3
commit 0b6a118a45
3 changed files with 16 additions and 2 deletions

View File

@ -1757,7 +1757,7 @@ class LoggerAdapter(object):
return self.logger.manager return self.logger.manager
@manager.setter @manager.setter
def set_manager(self, value): def manager(self, value):
self.logger.manager = value self.logger.manager = value
def __repr__(self): def __repr__(self):

View File

@ -3982,12 +3982,25 @@ class LoggerAdapterTest(unittest.TestCase):
msg = 'Adapters can be nested, yo.' msg = 'Adapters can be nested, yo.'
adapter_adapter = logging.LoggerAdapter(logger=self.adapter, extra=None) adapter_adapter = logging.LoggerAdapter(logger=self.adapter, extra=None)
adapter_adapter.log(logging.CRITICAL, msg, self.recording) adapter_adapter.log(logging.CRITICAL, msg, self.recording)
self.assertEqual(len(self.recording.records), 1) self.assertEqual(len(self.recording.records), 1)
record = self.recording.records[0] record = self.recording.records[0]
self.assertEqual(record.levelno, logging.CRITICAL) self.assertEqual(record.levelno, logging.CRITICAL)
self.assertEqual(record.msg, msg) self.assertEqual(record.msg, msg)
self.assertEqual(record.args, (self.recording,)) self.assertEqual(record.args, (self.recording,))
orig_manager = adapter_adapter.manager
self.assertIs(self.adapter.manager, orig_manager)
self.assertIs(self.logger.manager, orig_manager)
temp_manager = object()
try:
adapter_adapter.manager = temp_manager
self.assertIs(adapter_adapter.manager, temp_manager)
self.assertIs(self.adapter.manager, temp_manager)
self.assertIs(self.logger.manager, temp_manager)
finally:
adapter_adapter.manager = orig_manager
self.assertIs(adapter_adapter.manager, orig_manager)
self.assertIs(self.adapter.manager, orig_manager)
self.assertIs(self.logger.manager, orig_manager)
class LoggerTest(BaseTest): class LoggerTest(BaseTest):

View File

@ -0,0 +1 @@
The ``manager`` property on LoggerAdapter objects is now properly settable.