Issue #16141: replaced old-style exception handling code in logging with the modern...

diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index e79018f5be28116a5ac5daec80fc0a77cc65af15..0f804aeac890a1fb08ae645c8444b6e349c1087e 100644 (file)
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -67,7 +67,7 @@ else: #pragma: no cover
         """Return the frame object for the caller's stack frame."""
         try:
             raise Exception
-        except:
+        except Exception:
             return sys.exc_info()[2].tb_frame.f_back
 
 # _srcfile is only used in conjunction with sys._getframe().
@@ -938,9 +938,7 @@ class StreamHandler(Handler):
             stream.write(msg)
             stream.write(self.terminator)
             self.flush()
-        except (KeyboardInterrupt, SystemExit): #pragma: no cover
-            raise
-        except:
+        except Exception:
             self.handleError(record)
 
 class FileHandler(StreamHandler):
@@ -1837,7 +1835,7 @@ def shutdown(handlerList=_handlerList):
                     pass
                 finally:
                     h.release()
-        except:
+        except: # ignore everything, as we're shutting down
             if raiseExceptions:
                 raise
             #else, swallow

diff --git a/Lib/logging/config.py b/Lib/logging/config.py
index e71e89c4ee09cf23a80c9696dae850930f012b53..9ba3cca3bcf0a25565acc6344f72af93cfff8e61 100644 (file)
--- 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()

diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 1bad8560f1ed612f8556f5447c23c916b988b09e..5169af006287da7b43932a99df2c3c66d1bf56d3 100644 (file)
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -72,9 +72,7 @@ class BaseRotatingHandler(logging.FileHandler):
             if self.shouldRollover(record):
                 self.doRollover()
             logging.FileHandler.emit(self, record)
-        except (KeyboardInterrupt, SystemExit): #pragma: no cover
-            raise
-        except:
+        except Exception:
             self.handleError(record)
 
     def rotation_filename(self, default_name):
@@ -609,9 +607,7 @@ class SocketHandler(logging.Handler):
         try:
             s = self.makePickle(record)
             self.send(s)
-        except (KeyboardInterrupt, SystemExit): #pragma: no cover
-            raise
-        except:
+        except Exception:
             self.handleError(record)
 
     def close(self):
@@ -877,9 +873,7 @@ class SysLogHandler(logging.Handler):
                 self.socket.sendto(msg, self.address)
             else:
                 self.socket.sendall(msg)
-        except (KeyboardInterrupt, SystemExit): #pragma: no cover
-            raise
-        except:
+        except Exception:
             self.handleError(record)
 
 class SMTPHandler(logging.Handler):
@@ -957,9 +951,7 @@ class SMTPHandler(logging.Handler):
                 smtp.login(self.username, self.password)
             smtp.sendmail(self.fromaddr, self.toaddrs, msg)
             smtp.quit()
-        except (KeyboardInterrupt, SystemExit): #pragma: no cover
-            raise
-        except:
+        except Exception:
             self.handleError(record)
 
 class NTEventLogHandler(logging.Handler):
@@ -1044,9 +1036,7 @@ class NTEventLogHandler(logging.Handler):
                 type = self.getEventType(record)
                 msg = self.format(record)
                 self._welu.ReportEvent(self.appname, id, cat, type, [msg])
-            except (KeyboardInterrupt, SystemExit): #pragma: no cover
-                raise
-            except:
+            except Exception:
                 self.handleError(record)
 
     def close(self):
@@ -1131,9 +1121,7 @@ class HTTPHandler(logging.Handler):
             if self.method == "POST":
                 h.send(data.encode('utf-8'))
             h.getresponse()    #can't do anything with the result
-        except (KeyboardInterrupt, SystemExit): #pragma: no cover
-            raise
-        except:
+        except Exception:
             self.handleError(record)
 
 class BufferingHandler(logging.Handler):
@@ -1313,9 +1301,7 @@ class QueueHandler(logging.Handler):
         """
         try:
             self.enqueue(self.prepare(record))
-        except (KeyboardInterrupt, SystemExit): #pragma: no cover
-            raise
-        except:
+        except Exception:
             self.handleError(record)
 
 if threading: