summaryrefslogtreecommitdiff
path: root/Mailman/Deliverer.py
diff options
context:
space:
mode:
authorbwarsaw1998-07-22 21:35:06 +0000
committerbwarsaw1998-07-22 21:35:06 +0000
commitc657fd4c66645ac8390bb2d9ca2707ec81d608d5 (patch)
tree1b4a4ff6ff22ad3dbd88ca3a7c09aedcd653b2d8 /Mailman/Deliverer.py
parentc81d989f66a87460fb98ac5a154102995a4d527c (diff)
downloadmailman-c657fd4c66645ac8390bb2d9ca2707ec81d608d5.tar.gz
mailman-c657fd4c66645ac8390bb2d9ca2707ec81d608d5.tar.zst
mailman-c657fd4c66645ac8390bb2d9ca2707ec81d608d5.zip
CreateSubscribeAck(): Wrap the self.welcome_msg. This is typed into a
web form by the user who probably doesn't hit hard carriage returns. This looks ugly went emailed in the raw. SendUnsubscribeAck(): Likewise for self.goodbye_msg
Diffstat (limited to 'Mailman/Deliverer.py')
-rw-r--r--Mailman/Deliverer.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Mailman/Deliverer.py b/Mailman/Deliverer.py
index 75eb94bdb..63e0119b1 100644
--- a/Mailman/Deliverer.py
+++ b/Mailman/Deliverer.py
@@ -116,7 +116,7 @@ class Deliverer:
def CreateSubscribeAck(self, name, password):
if self.welcome_msg:
- welcome = self.welcome_msg + '\n'
+ welcome = Utils.wrap(self.welcome_msg) + '\n'
else:
welcome = ''
@@ -156,7 +156,8 @@ class Deliverer:
self.SendTextToUser(subject = 'Unsubscribed from "%s"\n' %
self.real_name,
recipient = name,
- text = self.goodbye_msg)
+ text = Utils.wrap(self.goodbye_msg))
+
def MailUserPassword(self, user):
listfullname = '%s@%s' % (self.real_name, self.host_name)
ok = 1