aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2018-03-01 09:26:02 -0800
committerMark Sapiro <mark@msapiro.net>2018-03-01 09:26:02 -0800
commitf10605db754277a509f99ae35538cd066d0143e2 (patch)
tree6ce215673d78b142b574fe58722e5642de184d09
parentefb0588b6eca8063fcefdd376335322db1cbb758 (diff)
downloadmailman2-f10605db754277a509f99ae35538cd066d0143e2.tar.gz
mailman2-f10605db754277a509f99ae35538cd066d0143e2.tar.xz
mailman2-f10605db754277a509f99ae35538cd066d0143e2.zip
Removed a Python 2.7 dependency introduced in 2.1.26.
-rwxr-xr-xMailman/Cgi/subscribe.py2
-rw-r--r--NEWS7
2 files changed, 8 insertions, 1 deletions
diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py
index 3977268c..aefce493 100755
--- a/Mailman/Cgi/subscribe.py
+++ b/Mailman/Cgi/subscribe.py
@@ -151,7 +151,7 @@ def process_form(mlist, doc, cgidata, lang):
if not captcha_response['success']:
e_codes = COMMASPACE.join(captcha_response['error-codes'])
results.append(_('reCAPTCHA validation failed: %(e_codes)s'))
- except urllib2.URLError as e:
+ except urllib2.URLError, e:
e_reason = e.reason
results.append(_('reCAPTCHA could not be validated: %(e_reason)s'))
diff --git a/NEWS b/NEWS
index 5f66485c..104de16b 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,13 @@ Copyright (C) 1998-2018 by the Free Software Foundation, Inc.
Here is a history of user visible changes to Mailman.
+2.1.27 (xx-xxx-xxxx)
+
+ Bug fixes and other patches
+
+ - A Python 2.7 dependency introduced with the reCAPTCHA feature in 2.1.26
+ has been removed. (LP: #1752658)
+
2.1.26 (04-Feb-2018)
Security