diff -r 178fd966423d -r 6e5bd561ddd0 iro/anbieter/smtp.py --- a/iro/anbieter/smtp.py Sun Feb 07 18:04:53 2010 +0100 +++ b/iro/anbieter/smtp.py Mon Feb 08 01:18:59 2010 +0100 @@ -19,8 +19,8 @@ logger=logging.getLogger("SMTP") class SMTP(): - def __init__(self,config_filename=None,section="smtp"): - self.config_filename=config_filename + def __init__(self,config_filenames=None,section="smtp"): + self.config_filenames=config_filenames self.section=section self.bStart=False self.bTLS=False @@ -28,13 +28,13 @@ self.max_recipients=1 - def read_basic_config(self,config_filename=None): + def read_basic_config(self,config_filenames=None): """Read basic options from the config file""" - if not (config_filename is None): - self.config_filename=config_filename + if not (config_filenames is None): + self.config_filenames=config_filenames cp = ConfigParser.ConfigParser() - cp.read([self.config_filename]) + cp.read(self.config_filenames) self.config_parser = cp self.send_from=cp.get(self.section, 'send_from') self.host=cp.get(self.section, 'host')