summaryrefslogtreecommitdiffstats
path: root/Lib/logging/config.py
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2012-10-09 07:06:13 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2012-10-09 07:06:13 (GMT)
commit8cf4eb1463217095e9276c0caacfb2df9372504f (patch)
tree026ba0deb3d3839450766c501c6769982f25566c /Lib/logging/config.py
parent85aa0118dbe0caf704d6c5de94ddcf7f4dcba32c (diff)
downloadcpython-8cf4eb1463217095e9276c0caacfb2df9372504f.zip
cpython-8cf4eb1463217095e9276c0caacfb2df9372504f.tar.gz
cpython-8cf4eb1463217095e9276c0caacfb2df9372504f.tar.bz2
Issue #16141: replaced old-style exception handling code in logging with the modern idiom.
Diffstat (limited to 'Lib/logging/config.py')
-rw-r--r--Lib/logging/config.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index e71e89c..9ba3cca 100644
--- a/Lib/logging/config.py
+++ b/Lib/logging/config.py
@@ -827,15 +827,13 @@ def listen(port=DEFAULT_LOGGING_CONFIG_PORT, verify=None):
d =json.loads(chunk)
assert isinstance(d, dict)
dictConfig(d)
- except:
+ except Exception:
#Apply new configuration.
file = io.StringIO(chunk)
try:
fileConfig(file)
- except (KeyboardInterrupt, SystemExit): #pragma: no cover
- raise
- except:
+ except Exception:
traceback.print_exc()
if self.server.ready:
self.server.ready.set()