Update of /cvsroot/mailman/mailman/Mailman
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26910
Modified Files:
Tag: Release_2_1-maint
Bouncer.py MailList.py
Log Message:
Python 2.4 checks strftime() more strict.
Split GetConfirmSubject into Leave/Join.
Index: Bouncer.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/Bouncer.py,v
retrieving revision 2.37.2.5
retrieving revision 2.37.2.6
diff -u -d -r2.37.2.5 -r2.37.2.6
--- Bouncer.py 22 Oct 2004 07:01:30 -0000 2.37.2.5
+++ Bouncer.py 4 Dec 2004 05:01:11 -0000 2.37.2.6
@@ -128,7 +128,7 @@
# We've already scored any bounces for this day, so ignore it.
syslog('bounce', '%s: %s already scored a bounce for date %s',
self.internal_name(), member,
- time.strftime('%d-%b-%Y', day + (0,)*6))
+ time.strftime('%d-%b-%Y', day + (0,0,0,0,1,0)))
# Continue to check phase below
else:
# See if this member's bounce information is stale.
Index: MailList.py
===================================================================
RCS file: /cvsroot/mailman/mailman/Mailman/MailList.py,v
retrieving revision 2.100.2.23
retrieving revision 2.100.2.24
diff -u -d -r2.100.2.23 -r2.100.2.24
--- MailList.py 19 Oct 2004 04:34:03 -0000 2.100.2.23
+++ MailList.py 4 Dec 2004 05:01:11 -0000 2.100.2.24
@@ -38,6 +38,7 @@
import email.Iterators
from email.Utils import getaddresses, formataddr, parseaddr
+from email.Header import Header
from Mailman import mm_cfg
from Mailman import Utils
@@ -206,10 +207,23 @@
'cookie': cookie,
} + '@' + self.host_name
+ def GetConfirmJoinSubject(self, listname, cookie):
+ if mm_cfg.VERP_CONFIRMATIONS and cookie:
+ cset = Utils.GetCharSet(self.preferred_language)
+ subj = Header(
+ _('Your confirmation is required to join the %(listname)s mailing list'),
+ cset, header_name='subject')
+ return subj
+ else:
+ return 'confirm ' + cookie
- def GetConfirmSubject(self, listname, cookie, verb):
+ def GetConfirmLeaveSubject(self, listname, cookie):
if mm_cfg.VERP_CONFIRMATIONS and cookie:
- return _( 'Your confirmation is required to %(verb)s the
%(listname)s mailing list' )
+ cset = Utils.GetCharSet(self.preferred_language)
+ subj = Header(
+ _('Your confirmation is required to leave the %(listname)s mailing list'),
+ cset, header_name='subject')
+ return subj
else:
return 'confirm ' + cookie
@@ -755,7 +769,7 @@
# list name to prevent invitees from cross-subscribing.
userdesc.invitation = self.internal_name()
cookie = self.pend_new(Pending.SUBSCRIPTION, userdesc)
- requestaddr = self.GetRequestEmail(cookie)
+ requestaddr = self.getListAddress('request')
confirmurl = '%s/%s' % (self.GetScriptURL('confirm', absolute=1),
cookie)
listname = self.real_name
@@ -769,11 +783,13 @@
'cookie' : cookie,
'listowner' : self.GetOwnerEmail(),
}, mlist=self)
- subj = self.GetConfirmSubject(listname, cookie, 'join')
sender = self.GetRequestEmail(cookie)
msg = Message.UserNotification(
- invitee, sender, subj,
- text, lang=self.preferred_language)
+ invitee, sender,
+ text=text, lang=self.preferred_language)
+ subj = self.GetConfirmJoinSubject(listname, cookie)
+ del msg['subject']
+ msg['Subject'] = subj
msg.send(self)
def AddMember(self, userdesc, remote=None):
@@ -880,7 +896,7 @@
'listaddr' : self.GetListEmail(),
'listname' : realname,
'cookie' : cookie,
- 'requestaddr' : self.GetRequestEmail(cookie),
+ 'requestaddr' : self.getListAddress('request'),
'remote' : remote,
'listadmin' : self.GetOwnerEmail(),
'confirmurl' : confirmurl,
@@ -890,7 +906,7 @@
text=text, lang=lang)
# BAW: See ChangeMemberAddress() for why we do it this way...
del msg['subject']
- msg['Subject'] = self.GetConfirmSubject(realname, cookie, 'join')
+ msg['Subject'] = self.GetConfirmJoinSubject(realname, cookie)
msg['Reply-To'] = self.GetRequestEmail(cookie)
msg.send(self)
who = formataddr((name, email))
@@ -1068,7 +1084,7 @@
'listaddr' : self.GetListEmail(),
'listname' : realname,
'cookie' : cookie,
- 'requestaddr': self.GetRequestEmail(cookie),
+ 'requestaddr': self.getListAddress('request'),
'remote' : '',
'listadmin' : self.GetOwnerEmail(),
'confirmurl' : confirmurl,
@@ -1084,7 +1100,7 @@
newaddr, self.GetRequestEmail(cookie),
text=text, lang=lang)
del msg['subject']
- msg['Subject'] = self.GetConfirmSubject(realname, cookie, 'join')
+ msg['Subject'] = self.GetConfirmJoinSubject(realname, cookie)
msg['Reply-To'] = self.GetRequestEmail(cookie)
msg.send(self)
@@ -1267,7 +1283,7 @@
'listaddr' : self.GetListEmail(),
'listname' : realname,
'cookie' : cookie,
- 'requestaddr' : self.GetRequestEmail(cookie),
+ 'requestaddr' : self.getListAddress('request'),
'remote' : remote,
'listadmin' : self.GetOwnerEmail(),
'confirmurl' : confirmurl,
@@ -1277,7 +1293,7 @@
text=text, lang=lang)
# BAW: See ChangeMemberAddress() for why we do it this way...
del msg['subject']
- msg['Subject'] = self.GetConfirmSubject(realname, cookie, 'leave')
+ msg['Subject'] = self.GetConfirmLeaveSubject(realname, cookie)
msg['Reply-To'] = self.GetRequestEmail(cookie)
msg.send(self)
_______________________________________________
Mailman-checkins mailing list
[EMAIL PROTECTED]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
