diff options
| author | Barry Warsaw | 2016-07-28 23:10:56 -0400 |
|---|---|---|
| committer | Barry Warsaw | 2016-07-28 23:10:56 -0400 |
| commit | 90e84bee5f47cbcdb9e9c367c60a877e325ef3e7 (patch) | |
| tree | bb7d2df3af049c6e84d65fd25cc0258b6af6ebb9 /src/mailman/mta/deliver.py | |
| parent | 86b25ba2e3bac0e034235d322c7c77080d737833 (diff) | |
| download | mailman-90e84bee5f47cbcdb9e9c367c60a877e325ef3e7.tar.gz mailman-90e84bee5f47cbcdb9e9c367c60a877e325ef3e7.tar.zst mailman-90e84bee5f47cbcdb9e9c367c60a877e325ef3e7.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 caca18aef..a5a4e2433 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 - listname = mlist.fqdn_listname, # noqa - sender = original_sender, # noqa - recip = len(original_recipients), # noqa - size = size, # noqa - time = t1 - t0, # noqa - refused = len(refused), # noqa - smtpcode = 'n/a', # noqa - smtpmsg = 'n/a', # noqa + 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 - smtpcode = code, # noqa - smtpmsg = smtp_message, # noqa + 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 |