From b3b302042d527deeeb87605ad22e7185d0beae20 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Wed, 22 Feb 2017 22:05:56 -0800 Subject: Fixed an uncaught TypeError in the subscribe CGI. --- Mailman/Cgi/subscribe.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Mailman') 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 -- cgit v1.2.3 From 2c34348878f40b9a0fe9784baf89d02cb3dac252 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Sat, 4 Mar 2017 13:21:54 -0800 Subject: Ensure added headers and footers have a trailing new-line. --- Mailman/Handlers/Decorate.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Mailman') 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 -- cgit v1.2.3 From 94a83e81638064e6d70fafe02a9b14b8866635e3 Mon Sep 17 00:00:00 2001 From: Mark Sapiro Date: Mon, 6 Mar 2017 12:34:18 -0800 Subject: Fixed a long standing typo. --- Mailman/Defaults.py.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Mailman') 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): -- cgit v1.2.3