diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2017-03-08 02:08:34 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2017-03-08 02:08:34 +0900 |
| commit | ef630eaf5b387fcf928490d0c80c49403444d55b (patch) | |
| tree | e7224f6ab59f63950bf6ffa30fb97fe54255a3fe /Mailman | |
| parent | 0a69c494ed3f92c9527cb5420a879ba272ae01cb (diff) | |
| parent | 94a83e81638064e6d70fafe02a9b14b8866635e3 (diff) | |
| download | mailman2-ef630eaf5b387fcf928490d0c80c49403444d55b.tar.gz mailman2-ef630eaf5b387fcf928490d0c80c49403444d55b.tar.xz mailman2-ef630eaf5b387fcf928490d0c80c49403444d55b.zip | |
Merge lp:mailman/2.1 up to rev 1696
Diffstat (limited to 'Mailman')
| -rwxr-xr-x | Mailman/Cgi/subscribe.py | 2 | ||||
| -rwxr-xr-x | Mailman/Defaults.py.in | 4 | ||||
| -rw-r--r-- | Mailman/Handlers/Decorate.py | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py index 36d25fa2..b2f8925e 100755 --- a/Mailman/Cgi/subscribe.py +++ b/Mailman/Cgi/subscribe.py @@ -185,7 +185,7 @@ def process_form(mlist, doc, cgidata, lang): if digestflag: try: digest = int(digestflag) - except ValueError: + except (TypeError, ValueError): digest = 0 else: digest = mlist.digest_is_default diff --git a/Mailman/Defaults.py.in b/Mailman/Defaults.py.in index fb2b26b6..6ad5d7ab 100755 --- a/Mailman/Defaults.py.in +++ b/Mailman/Defaults.py.in @@ -1,6 +1,6 @@ # -*- python -*- -# Copyright (C) 1998-2016 by the Free Software Foundation, Inc. +# Copyright (C) 1998-2017 by the Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -185,7 +185,7 @@ VIRTUAL_HOST_OVERVIEW = On # omitted it defaults to urlhost with the first name stripped off, e.g. # # add_virtualhost('www.dom.ain') -# VIRTUAL_HOST['www.dom.ain'] +# VIRTUAL_HOSTS['www.dom.ain'] # ==> 'dom.ain' # def add_virtualhost(urlhost, emailhost=None): diff --git a/Mailman/Handlers/Decorate.py b/Mailman/Handlers/Decorate.py index 69e86d5b..de8b44e6 100644 --- a/Mailman/Handlers/Decorate.py +++ b/Mailman/Handlers/Decorate.py @@ -240,4 +240,7 @@ def decorate(mlist, template, what, extradict=None): except (ValueError, TypeError), e: syslog('error', 'Exception while calculating %s:\n%s', what, e) text = template + # Ensure text ends with new-line + if not text.endswith('\n'): + text += '\n' return text |