~ubuntu-branches/debian/lenny/mailman/lenny

« back to all changes in this revision

Viewing changes to Mailman/OldStyleMemberships.py

  • Committer: Bazaar Package Importer
  • Author(s): Thijs Kinkhorst
  • Date: 2008-08-11 16:06:19 UTC
  • mfrom: (1.2.1 upstream) (2.1.15 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080811160619-3g4bwiysx7r9bsbf
Tags: 1:2.1.11-3
* Updated Catalan debconf translation, thanks David Planella Molas
  (Closes: #494110).
* Added patch 68_update_catalan to update Catalan program translation,
  thanks Jordi Mallach (Closes: #492297).
* Add a README.source file referring to quilt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2001-2003 by the Free Software Foundation, Inc.
 
1
# Copyright (C) 2001-2008 by the Free Software Foundation, Inc.
2
2
#
3
3
# This program is free software; you can redistribute it and/or
4
4
# modify it under the terms of the GNU General Public License
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
 
16
# USA.
16
17
 
17
18
"""Old style Mailman membership adaptor.
18
19
 
201
202
            value = 0
202
203
        else:
203
204
            value = member
204
 
            member = member.lower()
 
205
        member = member.lower()
205
206
        if digest:
206
207
            self.__mlist.digest_members[member] = value
207
208
        else:
243
244
        password = self.__mlist.passwords.get(memberkey,
244
245
                                              Utils.MakeRandomPassword())
245
246
        lang = self.getMemberLanguage(memberkey)
 
247
        delivery = self.__mlist.delivery_status.get(member.lower(),
 
248
                                              (MemberAdaptor.ENABLED,0))
246
249
        # First, possibly delete the old member
247
250
        if not nodelete:
248
251
            self.removeMember(memberkey)
252
255
        # Set the entire options bitfield
253
256
        if flags:
254
257
            self.__mlist.user_options[newaddress.lower()] = flags
 
258
        # If this is a straightforward address change, i.e. nodelete = 0,
 
259
        # preserve the delivery status and time if BYUSER or BYADMIN
 
260
        if delivery[0] in (MemberAdaptor.BYUSER, MemberAdaptor.BYADMIN)\
 
261
          and not nodelete:
 
262
            self.__mlist.delivery_status[newaddress.lower()] = delivery
255
263
 
256
264
    def setMemberPassword(self, memberkey, password):
257
265
        assert self.__mlist.Locked()
284
292
                    raise Errors.NotAMemberError, member
285
293
                del self.__mlist.members[memberkey]
286
294
                self.__mlist.digest_members[memberkey] = cpuser
 
295
                # If we recently turned off digest mode and are now
 
296
                # turning it back on, the member may be in one_last_digest.
 
297
                # If so, remove it so the member doesn't get a dup of the
 
298
                # next digest.
 
299
                if self.__mlist.one_last_digest.has_key(memberkey):
 
300
                    del self.__mlist.one_last_digest[memberkey]
287
301
            else:
288
302
                # Be sure the list supports regular delivery
289
303
                if not self.__mlist.nondigestable: