diff options
| author | Barry Warsaw | 2015-06-02 13:51:58 +0000 |
|---|---|---|
| committer | Barry Warsaw | 2015-06-02 10:09:24 -0400 |
| commit | e57787d8f6ff0cc8b1e30f2531a56eaf9a28511a (patch) | |
| tree | 8deb9773fe8e3871b5859a866a70019d92a9a3cb /src/mailman/rest | |
| parent | f0f13923af208d2eab97b6b304b77e9d5a55cc5a (diff) | |
| download | mailman-e57787d8f6ff0cc8b1e30f2531a56eaf9a28511a.tar.gz mailman-e57787d8f6ff0cc8b1e30f2531a56eaf9a28511a.tar.zst mailman-e57787d8f6ff0cc8b1e30f2531a56eaf9a28511a.zip | |
Merge branch 'issue-109' into 'release-3.0'
Closes: #109
* Fix the traceback that occurred when trying to convert a `text/html`
subpart to plaintext via the `mimedel` handler. Now, a configuration
variable `[mailman]html_to_plain_text_command` in the `mailman.cfg` file
defines the command to use. It defaults to `lynx`. (Closes: #109)
See merge request !14
Diffstat (limited to 'src/mailman/rest')
| -rw-r--r-- | src/mailman/rest/docs/systemconf.rst | 1 | ||||
| -rw-r--r-- | src/mailman/rest/tests/test_systemconf.py | 13 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/mailman/rest/docs/systemconf.rst b/src/mailman/rest/docs/systemconf.rst index 66953f4ba..fa8b7384b 100644 --- a/src/mailman/rest/docs/systemconf.rst +++ b/src/mailman/rest/docs/systemconf.rst @@ -15,6 +15,7 @@ You can also get all the values for a particular section. default_language: en email_commands_max_lines: 10 filtered_messages_are_preservable: no + html_to_plain_text_command: /usr/bin/lynx -dump $filename http_etag: ... layout: testing noreply_address: noreply diff --git a/src/mailman/rest/tests/test_systemconf.py b/src/mailman/rest/tests/test_systemconf.py index b8f14125b..4aa0dc920 100644 --- a/src/mailman/rest/tests/test_systemconf.py +++ b/src/mailman/rest/tests/test_systemconf.py @@ -43,16 +43,17 @@ class TestSystemConfiguration(unittest.TestCase): self.assertIn('http_etag', json) del json['http_etag'] self.assertEqual(json, dict( - site_owner='noreply@example.com', - noreply_address='noreply', default_language='en', - sender_headers='from from_ reply-to sender', email_commands_max_lines='10', + filtered_messages_are_preservable='no', + html_to_plain_text_command='/usr/bin/lynx -dump $filename', + layout='testing', + noreply_address='noreply', pending_request_life='3d', - pre_hook='', post_hook='', - layout='testing', - filtered_messages_are_preservable='no', + pre_hook='', + sender_headers='from from_ reply-to sender', + site_owner='noreply@example.com', )) def test_dotted_section(self): |