diff options
| author | Barry Warsaw | 2017-08-04 01:13:04 +0000 |
|---|---|---|
| committer | Barry Warsaw | 2017-08-04 01:13:04 +0000 |
| commit | 9cdcffbc1189a19bc2963cf3d5c86a3d4f1f24a6 (patch) | |
| tree | f021166b8c82bb02feff82a9360ba61a44b804ee /src/mailman/mta/deliver.py | |
| parent | e6326533b78290514ede917ed1cb95804759a45a (diff) | |
| download | mailman-9cdcffbc1189a19bc2963cf3d5c86a3d4f1f24a6.tar.gz mailman-9cdcffbc1189a19bc2963cf3d5c86a3d4f1f24a6.tar.zst mailman-9cdcffbc1189a19bc2963cf3d5c86a3d4f1f24a6.zip | |
Diffstat (limited to 'src/mailman/mta/deliver.py')
| -rw-r--r-- | src/mailman/mta/deliver.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mailman/mta/deliver.py b/src/mailman/mta/deliver.py index db069bd36..e614d5bd1 100644 --- a/src/mailman/mta/deliver.py +++ b/src/mailman/mta/deliver.py @@ -90,15 +90,15 @@ def deliver(mlist, msg, msgdata): if size is None: size = len(msg.as_string()) substitutions = dict( - msgid = msg.get('message-id', 'n/a'), # noqa: E221, E251 - listname = mlist.fqdn_listname, # noqa: E221, E251 - sender = original_sender, # noqa: E221, E251 - recip = len(original_recipients), # noqa: E221, E251 - size = size, # noqa: E221, E251 - time = t1 - t0, # noqa: E221, E251 - refused = len(refused), # noqa: E221, E251 - smtpcode = 'n/a', # noqa: E221, E251 - smtpmsg = 'n/a', # noqa: E221, E251 + msgid = msg.get('message-id', 'n/a'), # noqa: E221,E251 + listname = mlist.fqdn_listname, # noqa: E221,E251 + sender = original_sender, # noqa: E221,E251 + recip = len(original_recipients), # noqa: E221,E251 + size = size, # noqa: E221,E251 + time = t1 - t0, # noqa: E221,E251 + refused = len(refused), # noqa: E221,E251 + smtpcode = 'n/a', # noqa: E221,E251 + smtpmsg = 'n/a', # noqa: E221,E251 ) template = config.logging.smtp.every if template.lower() != 'no': @@ -141,9 +141,9 @@ def deliver(mlist, msg, msgdata): template = config.logging.smtp.failure if template.lower() != 'no': substitutions.update( - recip = recipient, # noqa: E221, E251 - smtpcode = code, # noqa: E221, E251 - smtpmsg = smtp_message, # noqa: E221, E251 + recip = recipient, # noqa: E221,E251 + smtpcode = code, # noqa: E221,E251 + smtpmsg = smtp_message, # noqa: E221,E251 ) log.info('%s', expand(template, mlist, substitutions)) # Return the results |