]> granicus.if.org Git - python/commitdiff
Issue #22646: Accept list as well as tuple to support initialisation via dictConfig().
authorVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 17 Oct 2014 07:42:57 +0000 (08:42 +0100)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>
Fri, 17 Oct 2014 07:42:57 +0000 (08:42 +0100)
Lib/logging/handlers.py

index b7bf931aa42548d60605869c2b2a2be5d3832195..201d2b5a7d6985584a562c768b0aa9e2876ce1b3 100644 (file)
@@ -889,11 +889,11 @@ class SMTPHandler(logging.Handler):
         certificate file. (This tuple is passed to the `starttls` method).
         """
         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