summaryrefslogtreecommitdiffstats
path: root/Lib/logging/config.py
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2011-03-11 18:44:10 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2011-03-11 18:44:10 (GMT)
commit3ae81137c8b8dc93ebdf846e1224150012040b75 (patch)
tree9f0d4b990bb571dc46e133e2350bbf332c0088a6 /Lib/logging/config.py
parentf4d0af460a279859b75c11500f14d14a1b29ee79 (diff)
downloadcpython-3ae81137c8b8dc93ebdf846e1224150012040b75.zip
cpython-3ae81137c8b8dc93ebdf846e1224150012040b75.tar.gz
cpython-3ae81137c8b8dc93ebdf846e1224150012040b75.tar.bz2
Reverted bug fixes for #11444 (fc4d045e3170) and #11424 (b9d76846bb1c), which should not have been made in this branch.
Diffstat (limited to 'Lib/logging/config.py')
-rw-r--r--Lib/logging/config.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index 2881e3f..eb2c248 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -232,14 +232,14 @@ def _install_loggers(cp, handlers, disable_existing_loggers):
propagate = 1
logger = logging.getLogger(qn)
if qn in existing:
- i = existing.index(qn) + 1 # start with the entry after qn
+ i = existing.index(qn)
prefixed = qn + "."
pflen = len(prefixed)
num_existing = len(existing)
- while i < num_existing:
- if existing[i][:pflen] == prefixed:
- child_loggers.append(existing[i])
- i += 1
+ i = i + 1 # look at the entry after qn
+ while (i < num_existing) and (existing[i][:pflen] == prefixed):
+ child_loggers.append(existing[i])
+ i = i + 1
existing.remove(qn)
if "level" in opts:
level = cp.get(sectname, "level")