diff options
Diffstat (limited to 'src/mailman/commands')
| -rw-r--r-- | src/mailman/commands/docs/echo.txt | 6 | ||||
| -rw-r--r-- | src/mailman/commands/docs/end.txt | 14 | ||||
| -rw-r--r-- | src/mailman/commands/docs/join.txt | 18 |
3 files changed, 19 insertions, 19 deletions
diff --git a/src/mailman/commands/docs/echo.txt b/src/mailman/commands/docs/echo.txt index 95b50b523..31da2dfcb 100644 --- a/src/mailman/commands/docs/echo.txt +++ b/src/mailman/commands/docs/echo.txt @@ -9,13 +9,13 @@ to the sender. 'echo' >>> command.argument_description '[args]' - >>> command.description - u'Echo an acknowledgement. Arguments are return unchanged.' + >>> print command.description + Echo an acknowledgement. Arguments are return unchanged. The original message is ignored, but the results receive the echoed command. >>> from mailman.app.lifecycle import create_list - >>> mlist = create_list(u'test@example.com') + >>> mlist = create_list('test@example.com') >>> from mailman.queue.command import Results >>> results = Results() diff --git a/src/mailman/commands/docs/end.txt b/src/mailman/commands/docs/end.txt index 98ca25bda..8f2c98ec8 100644 --- a/src/mailman/commands/docs/end.txt +++ b/src/mailman/commands/docs/end.txt @@ -7,8 +7,8 @@ processing email messages. >>> command = config.commands['end'] >>> command.name 'end' - >>> command.description - u'Stop processing commands.' + >>> print command.description + Stop processing commands. The 'end' command takes no arguments. @@ -19,7 +19,7 @@ The command itself is fairly simple; it just stops command processing, and the message isn't even looked at. >>> from mailman.app.lifecycle import create_list - >>> mlist = create_list(u'test@example.com') + >>> mlist = create_list('test@example.com') >>> from mailman.email.message import Message >>> print command.process(mlist, Message(), {}, (), None) ContinueProcessing.no @@ -27,10 +27,10 @@ message isn't even looked at. The 'stop' command is a synonym for 'end'. >>> command = config.commands['stop'] - >>> command.name - 'stop' - >>> command.description - u'Stop processing commands.' + >>> print command.name + stop + >>> print command.description + Stop processing commands. >>> command.argument_description '' >>> print command.process(mlist, Message(), {}, (), None) diff --git a/src/mailman/commands/docs/join.txt b/src/mailman/commands/docs/join.txt index eaafddc7c..8e4922151 100644 --- a/src/mailman/commands/docs/join.txt +++ b/src/mailman/commands/docs/join.txt @@ -28,7 +28,7 @@ No address to join >>> from mailman.email.message import Message >>> from mailman.app.lifecycle import create_list >>> from mailman.queue.command import Results - >>> mlist = create_list(u'alpha@example.com') + >>> mlist = create_list('alpha@example.com') When no address argument is given, the message's From address will be used. If that's missing though, then an error is returned. @@ -78,7 +78,7 @@ When the message has a From field, that address will be subscribed. Anne is not yet a member because she must confirm her subscription request first. - >>> print config.db.user_manager.get_user(u'anne@example.com') + >>> print config.db.user_manager.get_user('anne@example.com') None Mailman has sent her the confirmation message. @@ -121,11 +121,11 @@ list. >>> token = str(qmsg['subject']).split()[1].strip() >>> from mailman.interfaces.domain import IDomainManager >>> from mailman.interfaces.registrar import IRegistrar - >>> registrar = IRegistrar(IDomainManager(config)[u'example.com']) + >>> registrar = IRegistrar(IDomainManager(config)['example.com']) >>> registrar.confirm(token) True - >>> user = config.db.user_manager.get_user(u'anne@example.com') + >>> user = config.db.user_manager.get_user('anne@example.com') >>> print user.real_name Anne Person >>> list(user.addresses) @@ -133,7 +133,7 @@ list. Anne is also now a member of the mailing list. - >>> mlist.members.get_member(u'anne@example.com') + >>> mlist.members.get_member('anne@example.com') <Member: Anne Person <anne@example.com> on alpha@example.com as MemberRole.member> @@ -141,7 +141,7 @@ Anne is also now a member of the mailing list. Joining a second list --------------------- - >>> mlist_2 = create_list(u'baker@example.com') + >>> mlist_2 = create_list('baker@example.com') >>> msg = message_from_string("""\ ... From: Anne Person <anne@example.com> ... @@ -151,12 +151,12 @@ Joining a second list Anne of course, is still registered. - >>> print config.db.user_manager.get_user(u'anne@example.com') + >>> print config.db.user_manager.get_user('anne@example.com') <User "Anne Person" at ...> But she is not a member of the mailing list. - >>> print mlist_2.members.get_member(u'anne@example.com') + >>> print mlist_2.members.get_member('anne@example.com') None One Anne confirms this subscription, she becomes a member of the mailing list. @@ -166,6 +166,6 @@ One Anne confirms this subscription, she becomes a member of the mailing list. >>> registrar.confirm(token) True - >>> print mlist_2.members.get_member(u'anne@example.com') + >>> print mlist_2.members.get_member('anne@example.com') <Member: Anne Person <anne@example.com> on baker@example.com as MemberRole.member> |