summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2014-10-17 08:49:38 +0100
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2014-10-17 08:49:38 +0100
commit16c41ab4603c0ce14ff6cbf55965fd7e1a46e6b4 (patch)
treec5367cea6871dc5cf413c746fe3afd0d6a1095a7
parentcd567365c9f95cf005d6bb7c1da7946b68a43ab4 (diff)
downloadcpython-git-16c41ab4603c0ce14ff6cbf55965fd7e1a46e6b4.tar.gz
Issue #22646: Accept list as well as tuple to support initialisation via dictConfig().
-rw-r--r--Lib/logging/handlers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
index 0e58dbea05..b371824054 100644
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -931,11 +931,11 @@ class SMTPHandler(logging.Handler):
default is one second).
"""
logging.Handler.__init__(self)
- if isinstance(mailhost, tuple):
+ if isinstance(mailhost, (list, tuple)):
self.mailhost, self.mailport = mailhost
else:
self.mailhost, self.mailport = mailhost, None
- if isinstance(credentials, tuple):
+ if isinstance(credentials, (list, tuple)):
self.username, self.password = credentials
else:
self.username = None