summaryrefslogtreecommitdiff
path: root/src/mailman/app
diff options
context:
space:
mode:
authorBarry Warsaw2017-07-22 03:02:05 +0000
committerBarry Warsaw2017-07-22 03:02:05 +0000
commitf00b94f18e1d82d1488cbcee6053f03423bc2f49 (patch)
tree1a8e56dff0eab71e58e5fc9ecc5f3c614d7edca7 /src/mailman/app
parentf54c045519300f6f70947d1114f46c2b8ae0d368 (diff)
downloadmailman-f00b94f18e1d82d1488cbcee6053f03423bc2f49.tar.gz
mailman-f00b94f18e1d82d1488cbcee6053f03423bc2f49.tar.zst
mailman-f00b94f18e1d82d1488cbcee6053f03423bc2f49.zip
Diffstat (limited to 'src/mailman/app')
-rw-r--r--src/mailman/app/docs/hooks.rst7
-rw-r--r--src/mailman/app/subscriptions.py2
-rw-r--r--src/mailman/app/workflow.py2
3 files changed, 7 insertions, 4 deletions
diff --git a/src/mailman/app/docs/hooks.rst b/src/mailman/app/docs/hooks.rst
index ba9bb249e..07d0ec33c 100644
--- a/src/mailman/app/docs/hooks.rst
+++ b/src/mailman/app/docs/hooks.rst
@@ -53,8 +53,11 @@ script that will produce no output to force the hooks to run.
>>> from mailman.testing.layers import ConfigLayer
>>> def call():
... exe = os.path.join(os.path.dirname(sys.executable), 'mailman')
- ... env = dict(MAILMAN_CONFIG_FILE=config_path,
- ... PYTHONPATH=config_directory)
+ ... env = os.environ.copy()
+ ... env.update(
+ ... MAILMAN_CONFIG_FILE=config_path,
+ ... PYTHONPATH=config_directory,
+ ... )
... test_cfg = os.environ.get('MAILMAN_EXTRA_TESTING_CFG')
... if test_cfg is not None:
... env['MAILMAN_EXTRA_TESTING_CFG'] = test_cfg
diff --git a/src/mailman/app/subscriptions.py b/src/mailman/app/subscriptions.py
index 0d1e979f5..0d8176ffb 100644
--- a/src/mailman/app/subscriptions.py
+++ b/src/mailman/app/subscriptions.py
@@ -211,7 +211,7 @@ class SubscriptionWorkflow(_SubscriptionWorkflowCommon):
# verified by a full coverage run, but diffcov for some reason
# claims that the test added in the branch that added this code
# does not cover the change. That seems like a bug in diffcov.
- raise AlreadySubscribedError( # pragma: no cover
+ raise AlreadySubscribedError( # pragma: nocover
self.mlist.fqdn_listname,
self.address.email,
MemberRole.member)
diff --git a/src/mailman/app/workflow.py b/src/mailman/app/workflow.py
index cd8909c1a..92b78c184 100644
--- a/src/mailman/app/workflow.py
+++ b/src/mailman/app/workflow.py
@@ -59,7 +59,7 @@ class Workflow:
name = self._next.popleft()
step = getattr(self, '_step_{}'.format(name))
self._count += 1
- if self.debug: # pragma: no cover
+ if self.debug: # pragma: nocover
print('[{:02d}] -> {}'.format(self._count, name), file=sys.stderr)
return name, step