from ..xlate import XLATOR
-__version__ = '0.2.3'
+__version__ = '0.2.4'
LOG = logging.getLogger(__name__)
_ = XLATOR.gettext
# -------------------------------------------------------------------------
def eval(self):
- self.mail_recipients = []
- self.mail_cc = []
-
super(MailConfiguration, self).eval()
if not self.mail_recipients:
# -------------------------------------------------------------------------
def _eval_mail_rcpt(self, section_name, section):
+ self.mail_recipients = []
+
re_rcpt = re.compile(r'^\s*(mail[_-]?)?(recipients?|rcpt)\s*$', re.IGNORECASE)
for key in section.keys():
else:
result = self._split_mailaddress_tokens(val, _("recipient mail address"))
if result:
- self.mail_recipients.expand += result
+ self.mail_recipients += result
# -------------------------------------------------------------------------
def _eval_mail_cc(self, section_name, section):
+ self.mail_cc = []
+
re_cc = re.compile(r'^\s*(mail[_-]?)?cc\s*$', re.IGNORECASE)
for key in section.keys():
for v in val:
result = self._split_mailaddress_tokens(v, _("cc mail address"))
if result:
- self.mail_cc.expand += result
+ self.mail_cc += result
else:
result = self._split_mailaddress_tokens(val, _("cc mail address"))
if result:
- self.mail_cc.expand += result
+ self.mail_cc += result
# -------------------------------------------------------------------------
def _eval_mail_reply_to(self, section_name, section):