]> Frank Brehm's Git Trees - pixelpark/admin-tools.git/commitdiff
Bugfixing
authorFrank Brehm <frank.brehm@pixelpark.com>
Wed, 22 Mar 2017 15:40:02 +0000 (16:40 +0100)
committerFrank Brehm <frank.brehm@pixelpark.com>
Wed, 22 Mar 2017 15:40:02 +0000 (16:40 +0100)
pp_lib/cfg_app.py

index e2ea0d2837ca28b83c2a4e685b8ed133f529debf..793c05f3d611977d72ad1895c56dca43c8da983a 100644 (file)
@@ -44,7 +44,7 @@ from .mailaddress import MailAddress
 
 from .app import PpApplication
 
-__version__ = '0.5.1'
+__version__ = '0.5.2'
 LOG = logging.getLogger(__name__)
 
 VALID_MAIL_METHODS = ('smtp', 'sendmail')
@@ -472,40 +472,45 @@ class PpConfigApplication(PpApplication):
             if 'mail_recipients' in section:
                 v = section['mail_recipients'].strip()
                 self.mail_recipients = []
-                tokens = self.whitespace_re.split(v)
-                for token in tokens:
-                    if MailAddress.valid_address(token):
-                        if token not in self.mail_recipients:
-                            self.mail_recipients.append(token)
-                    else:
-                        msg = "Found invalid recipient mail address {!r} in configuration.".format(
-                            token)
-                        LOG.error(msg)
+                if v:
+                    tokens = self.whitespace_re.split(v)
+                    for token in tokens:
+                        if MailAddress.valid_address(token):
+                            if token not in self.mail_recipients:
+                                self.mail_recipients.append(token)
+                        else:
+                            msg = (
+                                "Found invalid recipient mail address {!r} "
+                                "in configuration.").format(
+                                token)
+                            LOG.error(msg)
 
             if 'mail_cc' in section:
                 v = section['mail_cc'].strip()
                 self.mail_cc = []
-                tokens = self.whitespace_re.split(v)
-                for token in tokens:
-                    if MailAddress.valid_address(token):
-                        if token not in self.mail_cc:
-                            self.mail_cc.append(token)
-                    else:
-                        msg = "Found invalid cc mail address {!r} in configuration.".format(
-                            token)
-                        LOG.error(msg)
+                if v:
+                    tokens = self.whitespace_re.split(v)
+                    for token in tokens:
+                        if MailAddress.valid_address(token):
+                            if token not in self.mail_cc:
+                                self.mail_cc.append(token)
+                        else:
+                            msg = "Found invalid cc mail address {!r} in configuration.".format(
+                                token)
+                            LOG.error(msg)
 
             if 'reply_to' in section:
                 v = section['reply_to'].strip()
                 self.reply_to = None
-                tokens = self.whitespace_re.split(v)
-                if len(tokens):
-                    if MailAddress.valid_address(tokens[0]):
-                        self.reply_to = tokens[0]
-                    else:
-                        msg = "Found invalid reply mail address {!r} in configuration.".format(
-                            tokens[0])
-                        LOG.error(msg)
+                if v:
+                    tokens = self.whitespace_re.split(v)
+                    if len(tokens):
+                        if MailAddress.valid_address(tokens[0]):
+                            self.reply_to = tokens[0]
+                        else:
+                            msg = "Found invalid reply mail address {!r} in configuration.".format(
+                                tokens[0])
+                            LOG.error(msg)
 
             if 'mail_server' in section:
                 v = section['reply_to'].strip()