summaryrefslogtreecommitdiffstats
path: root/Lib/logging/config.py
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2013-03-23 11:23:05 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2013-03-23 11:23:05 (GMT)
commit8ec95b81d53bcadc7bb8defebb5cdf73261823f9 (patch)
tree278d0006e56aa77f631c3daea49fcc01752293f5 /Lib/logging/config.py
parent42fb352a987050eb042ca8b83d679752e02e1441 (diff)
parent9b862b9d6679ed0de6dfeba158b417d79d4d6ed1 (diff)
downloadcpython-8ec95b81d53bcadc7bb8defebb5cdf73261823f9.zip
cpython-8ec95b81d53bcadc7bb8defebb5cdf73261823f9.tar.gz
cpython-8ec95b81d53bcadc7bb8defebb5cdf73261823f9.tar.bz2
Closes #17521: Merged fix from 3.3.
Diffstat (limited to 'Lib/logging/config.py')
-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 a65fd73..b0c0971 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -175,8 +175,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"""