Mark Sapiro pushed to branch master at GNU Mailman / Mailman Core
Commits:
47bf959d by Mark Sapiro at 2019-12-21T13:31:15-08:00
Fix the name of the queue directory in inject help.
- - - - -
ff2f396b by Mark Sapiro at 2019-12-21T15:21:22-08:00
Minor moving of pragma: nocover so diffcov succeeds.
- - - - -
abf6f47c by Mark Sapiro at 2019-12-21T23:32:44+00:00
Merge branch 'fix_656' into 'master'
Fix the name of the queue directory in inject help.
Closes #656
See merge request mailman/mailman!581
- - - - -
2 changed files:
- src/mailman/commands/cli_inject.py
- src/mailman/commands/cli_members.py
Changes:
=====================================
src/mailman/commands/cli_inject.py
=====================================
@@ -47,7 +47,7 @@ def show_queues(ctx, param, value):
'--queue', '-q',
help=_("""\
The name of the queue to inject the message to. QUEUE must be one of the
- directories inside the qfiles directory. If omitted, the incoming queue is
+ directories inside the queue directory. If omitted, the incoming queue is
used."""))
@click.option(
'--show', '-s',
=====================================
src/mailman/commands/cli_members.py
=====================================
@@ -114,17 +114,18 @@ def add_members(mlist, add_infp):
continue
# Parse the line and ensure that the values are unicodes.
display_name, email = parseaddr(line)
- if email == '': # pragma: nocover
- line = line.strip() # pragma: nocover
+ if email == '':
+ line = line.strip()
print(_('Cannot parse as valid email address (skipping): $line'),
- file=sys.stderr) # pragma: nocover
- continue # pragma: nocover
+ file=sys.stderr)
+ continue
try:
add_member(mlist,
RequestRecord(email, display_name,
DeliveryMode.regular,
mlist.preferred_language.code))
- except InvalidEmailAddressError:
+ except InvalidEmailAddressError: # pragma: nocover
+ # There is a test for this, but it hits the if email == '' above.
# It's okay if the address is invalid, we print a warning and
# continue.
line = line.strip()
View it on GitLab:
https://gitlab.com/mailman/mailman/compare/43a91e9d65dd6a15c7e71d45ceb209f050ab7e3e...abf6f47c0b484bbb927df7becdb797e89677729c
--
View it on GitLab:
https://gitlab.com/mailman/mailman/compare/43a91e9d65dd6a15c7e71d45ceb209f050ab7e3e...abf6f47c0b484bbb927df7becdb797e89677729c
You're receiving this email because of your account on gitlab.com.
_______________________________________________
Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe:
https://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
