summaryrefslogtreecommitdiffstats
path: root/Lib/logging
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2013-03-23 11:22:00 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2013-03-23 11:22:00 (GMT)
commit9b862b9d6679ed0de6dfeba158b417d79d4d6ed1 (patch)
treeae203f99b6a7c55a14d53f905ecfc973ece0c650 /Lib/logging
parente29dd24706e839ef865e74b6bc6c15e91121b7b7 (diff)
parent68b4cc87cd75822552914fb59f5bf53fe6c28202 (diff)
downloadcpython-9b862b9d6679ed0de6dfeba158b417d79d4d6ed1.zip
cpython-9b862b9d6679ed0de6dfeba158b417d79d4d6ed1.tar.gz
cpython-9b862b9d6679ed0de6dfeba158b417d79d4d6ed1.tar.bz2
Issue #17521: Merged fix from 3.2.
Diffstat (limited to 'Lib/logging')
-rw-r--r--Lib/logging/config.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 0cce710..11e79a2 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -172,8 +172,8 @@ def _handle_existing_loggers(existing, child_loggers, disable_existing):
logger.level = logging.NOTSET
logger.handlers = []
logger.propagate = True
- elif disable_existing:
- logger.disabled = True
+ else:
+ logger.disabled = disable_existing
def _install_loggers(cp, handlers, disable_existing):
"""Create and install loggers"""