Bare except clause removed from SMTPHandler.emit(). Now, only ImportError is trapped.
Bare except clause removed from SocketHandler.createSocket(). Now, only socket.error is trapped.
(SF #411881)
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 4ef896e..cd8d5d2 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -343,7 +343,7 @@
try:
self.sock = self.makeSocket()
self.retryTime = None # next time, no delay before trying
- except:
+ except socket.error:
#Creation failed, so set the retry time and return.
if self.retryTime is None:
self.retryPeriod = self.retryStart
@@ -734,7 +734,7 @@
import smtplib
try:
from email.Utils import formatdate
- except:
+ except ImportError:
formatdate = self.date_time
port = self.mailport
if not port: