[Python-checkins] cpython (2.7): Issue #22646: Accept list as well as tuple to support initialisation via
vinay.sajip
python-checkins at python.org
Fri Oct 17 09:52:40 CEST 2014
https://hg.python.org/cpython/rev/3ba23c6f7986
changeset: 93100:3ba23c6f7986
branch: 2.7
parent: 93097:f5be7fc270d1
user: Vinay Sajip <vinay_sajip at yahoo.co.uk>
date: Fri Oct 17 08:42:57 2014 +0100
summary:
Issue #22646: Accept list as well as tuple to support initialisation via dictConfig().
files:
Lib/logging/handlers.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py
--- a/Lib/logging/handlers.py
+++ b/Lib/logging/handlers.py
@@ -889,11 +889,11 @@
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
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list