Skip to content

Commit 0b6a118

Browse files
authored
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.
1 parent 032a648 commit 0b6a118

File tree

3 files changed

+16
-2
lines changed

3 files changed

+16
-2
lines changed

Lib/logging/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1757,7 +1757,7 @@ def manager(self):
17571757
return self.logger.manager
17581758

17591759
@manager.setter
1760-
def set_manager(self, value):
1760+
def manager(self, value):
17611761
self.logger.manager = value
17621762

17631763
def __repr__(self):

Lib/test/test_logging.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3982,12 +3982,25 @@ def test_nested(self):
39823982
msg = 'Adapters can be nested, yo.'
39833983
adapter_adapter = logging.LoggerAdapter(logger=self.adapter, extra=None)
39843984
adapter_adapter.log(logging.CRITICAL, msg, self.recording)
3985-
39863985
self.assertEqual(len(self.recording.records), 1)
39873986
record = self.recording.records[0]
39883987
self.assertEqual(record.levelno, logging.CRITICAL)
39893988
self.assertEqual(record.msg, msg)
39903989
self.assertEqual(record.args, (self.recording,))
3990+
orig_manager = adapter_adapter.manager
3991+
self.assertIs(self.adapter.manager, orig_manager)
3992+
self.assertIs(self.logger.manager, orig_manager)
3993+
temp_manager = object()
3994+
try:
3995+
adapter_adapter.manager = temp_manager
3996+
self.assertIs(adapter_adapter.manager, temp_manager)
3997+
self.assertIs(self.adapter.manager, temp_manager)
3998+
self.assertIs(self.logger.manager, temp_manager)
3999+
finally:
4000+
adapter_adapter.manager = orig_manager
4001+
self.assertIs(adapter_adapter.manager, orig_manager)
4002+
self.assertIs(self.adapter.manager, orig_manager)
4003+
self.assertIs(self.logger.manager, orig_manager)
39914004

39924005

39934006
class LoggerTest(BaseTest):
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
The ``manager`` property on LoggerAdapter objects is now properly settable.

0 commit comments

Comments
 (0)