aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2017-02-22 22:05:56 -0800
committerMark Sapiro <mark@msapiro.net>2017-02-22 22:05:56 -0800
commitb3b302042d527deeeb87605ad22e7185d0beae20 (patch)
tree0f11859c7ad0e95bb67e812e251acf6a7b1e6a20
parentf6a1a582337e333e57824450898622d1a65d8f2a (diff)
downloadmailman2-b3b302042d527deeeb87605ad22e7185d0beae20.tar.gz
mailman2-b3b302042d527deeeb87605ad22e7185d0beae20.tar.xz
mailman2-b3b302042d527deeeb87605ad22e7185d0beae20.zip
Fixed an uncaught TypeError in the subscribe CGI.
-rwxr-xr-xMailman/Cgi/subscribe.py2
-rw-r--r--NEWS2
2 files changed, 3 insertions, 1 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/NEWS b/NEWS
index dc9c155a..fde02dd4 100644
--- a/NEWS
+++ b/NEWS
@@ -26,6 +26,8 @@ Here is a history of user visible changes to Mailman.
Bug fixes and other patches
+ - Fixed an uncaught TypeError in the subscribe CGI. (LP: #1667215)
+
- Added recognition for a newly seen mailEnable bounce.
- Fixed an uncaught NotAMemberError when a member is removed before a