From b32d8b4f9bcd2e7d11240b6b9de0262cf8f5e09d Mon Sep 17 00:00:00 2001 From: Matthias Bussonnier Date: Wed, 16 Dec 2020 01:43:39 -0800 Subject: bpo-42644: Validate values in logging.disable() (#23786) * bpo-42644: Validate values in logging.disable() Technically make the value of manager a property that checks and convert values assigned to it properly. This has the side effect of making `logging.disable` also accept strings representing the various level of warnings. We want to validate the type of the disable attribute at assignment time, as it is later compared to other levels when emitting warnings and would generate a `TypeError: '>=' not supported between ....` in a different part of the code base, which can make it difficult to track down. When assigned an incorrect value; it will raise a TypeError when the wrong type, or ValueError if an invalid str. Co-authored-by: Andrew Svetlov --- Lib/logging/__init__.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Lib/logging/__init__.py') diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index badfd654b16..50b7378cd63 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -1289,6 +1289,14 @@ class Manager(object): self.loggerClass = None self.logRecordFactory = None + @property + def disable(self): + return self._disable + + @disable.setter + def disable(self, value): + self._disable = _checkLevel(value) + def getLogger(self, name): """ Get a logger with the specified name (channel name), creating it -- cgit v1.2.3