diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman/commands/docs/members.rst | 2 | ||||
| -rw-r--r-- | src/mailman/commands/docs/qfile.rst | 6 | ||||
| -rw-r--r-- | src/mailman/handlers/acknowledge.py | 3 | ||||
| -rw-r--r-- | src/mailman/utilities/importer.py | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/src/mailman/commands/docs/members.rst b/src/mailman/commands/docs/members.rst index 5ec1521a5..28f238f31 100644 --- a/src/mailman/commands/docs/members.rst +++ b/src/mailman/commands/docs/members.rst @@ -236,7 +236,7 @@ taken from standard input. ... 'fperson@example.com (Fred Person)', ... ): ... print(address, file=fp) - >>> fp.seek(0) + >>> filepos = fp.seek(0) >>> import sys >>> sys.stdin = fp diff --git a/src/mailman/commands/docs/qfile.rst b/src/mailman/commands/docs/qfile.rst index f4732e3be..e097ebf97 100644 --- a/src/mailman/commands/docs/qfile.rst +++ b/src/mailman/commands/docs/qfile.rst @@ -54,11 +54,7 @@ Once we've figured out the file name of the shunted message, we can print it. I borkeded Mailman. <BLANKLINE> <----- start object 2 -----> - { '_parsemsg': False, - 'bad': 'yes', - 'bar': 'baz', - 'foo': 7, - 'version': 3} + {'_parsemsg': False, 'bad': 'yes', 'bar': 'baz', 'foo': 7, 'version': 3} [----- end pickle -----] Maybe we don't want to print the contents of the file though, in case we want diff --git a/src/mailman/handlers/acknowledge.py b/src/mailman/handlers/acknowledge.py index c3af9ab27..bd8b8861d 100644 --- a/src/mailman/handlers/acknowledge.py +++ b/src/mailman/handlers/acknowledge.py @@ -67,14 +67,13 @@ class Acknowledge: language = (language_manager[msgdata['lang']] if 'lang' in msgdata else member.preferred_language) - charset = language_manager[language.code].charset # Now get the acknowledgement template. display_name = mlist.display_name text = make('postack.txt', mailing_list=mlist, language=language.code, wrap=False, - subject=oneline(original_subject, charset), + subject=oneline(original_subject, in_unicode=True), list_name=mlist.list_name, display_name=display_name, listinfo_url=mlist.script_url('listinfo'), diff --git a/src/mailman/utilities/importer.py b/src/mailman/utilities/importer.py index b2c15e6f8..e6e51ef64 100644 --- a/src/mailman/utilities/importer.py +++ b/src/mailman/utilities/importer.py @@ -384,7 +384,7 @@ def import_config_pck(mlist, config_dict): # Import rosters. regulars_set = set(config_dict.get('members', {})) digesters_set = set(config_dict.get('digest_members', {})) - members = regulars_set + digesters_set + members = regulars_set.union(digesters_set) import_roster(mlist, config_dict, members, MemberRole.member) import_roster(mlist, config_dict, config_dict.get('owner', []), MemberRole.owner) |