aboutsummaryrefslogtreecommitdiffstats
path: root/Mailman/Cgi
diff options
context:
space:
mode:
authorMark Sapiro <mark@msapiro.net>2009-01-20 12:22:08 -0800
committerMark Sapiro <mark@msapiro.net>2009-01-20 12:22:08 -0800
commitc0da6af58657b1fe5730d3dea0e78bc17dac490a (patch)
tree76b912982fc75ac4bfd9b607c5a2e187497d9ef7 /Mailman/Cgi
parent150b03583ed0b2937b5cf7b46723a8e1eb49be63 (diff)
downloadmailman2-c0da6af58657b1fe5730d3dea0e78bc17dac490a.tar.gz
mailman2-c0da6af58657b1fe5730d3dea0e78bc17dac490a.tar.xz
mailman2-c0da6af58657b1fe5730d3dea0e78bc17dac490a.zip
Two of the 'new' class exceptions are raised with an argument.
Diffstat (limited to '')
-rw-r--r--Mailman/Cgi/subscribe.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/Mailman/Cgi/subscribe.py b/Mailman/Cgi/subscribe.py
index 3661dcde..80019581 100644
--- a/Mailman/Cgi/subscribe.py
+++ b/Mailman/Cgi/subscribe.py
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2003 by the Free Software Foundation, Inc.
+# Copyright (C) 1998-2009 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
@@ -12,7 +12,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
"""Process subscription or roster requests from listinfo form."""
@@ -204,8 +205,8 @@ your subscription.""")
if privacy_results:
results = privacy_results
else:
- # We need to interpolate into x
- x = _(x)
+ # We need to interpolate into x.__str__()
+ x = _(str(x))
results = _("""\
Your subscription request was deferred because %(x)s. Your request has been
forwarded to the list moderator. You will receive email informing you of the