Added checks for tuples in dictConfig.
This commit is contained in:
parent
d45a278b93
commit
1adbee226e
|
@ -474,6 +474,12 @@ class BaseConfigurator(object):
|
||||||
setattr(result, name, value)
|
setattr(result, name, value)
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
def as_tuple(self, value):
|
||||||
|
"""Utility function which converts lists to tuples."""
|
||||||
|
if isinstance(value, list):
|
||||||
|
value = tuple(value)
|
||||||
|
return value
|
||||||
|
|
||||||
class DictConfigurator(BaseConfigurator):
|
class DictConfigurator(BaseConfigurator):
|
||||||
"""
|
"""
|
||||||
Configure logging using a dictionary-like object to describe the
|
Configure logging using a dictionary-like object to describe the
|
||||||
|
@ -688,6 +694,12 @@ class DictConfigurator(BaseConfigurator):
|
||||||
except StandardError, e:
|
except StandardError, e:
|
||||||
raise ValueError('Unable to set target handler '
|
raise ValueError('Unable to set target handler '
|
||||||
'%r: %s' % (config['target'], e))
|
'%r: %s' % (config['target'], e))
|
||||||
|
elif issubclass(klass, logging.handlers.SMTPHandler) and\
|
||||||
|
'mailhost' in config:
|
||||||
|
config['mailhost'] = self.as_tuple(config['mailhost'])
|
||||||
|
elif issubclass(klass, logging.handlers.SysLogHandler) and\
|
||||||
|
'address' in config:
|
||||||
|
config['address'] = self.as_tuple(config['address'])
|
||||||
factory = klass
|
factory = klass
|
||||||
kwargs = dict([(k, config[k]) for k in config if valid_ident(k)])
|
kwargs = dict([(k, config[k]) for k in config if valid_ident(k)])
|
||||||
try:
|
try:
|
||||||
|
|
Loading…
Reference in New Issue