[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mailman-cvs
Subject:    [Mailman-checkins] [Branch ~mailman-coders/mailman/2.2] Rev 1047:
From:       noreply () launchpad ! net
Date:       2009-03-14 22:22:08
Message-ID: 20090314222208.13953.49534.launchpad () loganberry ! canonical ! com
[Download RAW message or body]

------------------------------------------------------------
revno: 1047
committer: Mark Sapiro <mark@msapiro.net>
branch nick: 2.2
timestamp: Sat 2009-03-14 15:13:15 -0700
message:
  Fixed Pending._update() to return a UserDesc instance.
modified:
  Mailman/Pending.py

=== modified file 'Mailman/Pending.py'
--- Mailman/Pending.py	2008-11-13 04:02:29 +0000
+++ Mailman/Pending.py	2009-03-14 22:13:15 +0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2008 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.
 
 """Track pending actions which require confirmation."""
 
@@ -23,6 +24,7 @@
 import cPickle
 
 from Mailman import mm_cfg
+from Mailman import UserDesc
 from Mailman.Utils import sha_new
 
 # Types of pending records
@@ -173,10 +175,13 @@
         # separate, but require the prepending of a record type indicator.  We
         # know that the only things that were kept in the old format were
         # subscription requests.  Also, the old request format didn't have the
-        # subscription language.  Best we can do here is use the server
-        # default.
-        db[cookie] = (SUBSCRIPTION,) + data[:-1] + \
-                     (mm_cfg.DEFAULT_SERVER_LANGUAGE,)
+        # subscription language so we leave it as None in the UserDesc and
+        # confirmation processing will take care of it.
+        ud = UserDesc.UserDesc(address=data[0],
+                               password=data[1],
+                               digest=data[2],
+                               )
+        db[cookie] = (SUBSCRIPTION, ud)
         # The old database format kept the timestamp as the time the request
         # was made.  The new format keeps it as the time the request should be
         # evicted.



--
Active development version (web u/i update)
https://code.launchpad.net/~mailman-coders/mailman/2.2

Your team Mailman Checkins is subscribed to branch lp:mailman/2.2.
To unsubscribe from this branch go to \
https://code.launchpad.net/~mailman-coders/mailman/2.2/+edit-subscription. \
_______________________________________________ Mailman-checkins mailing list
Mailman-checkins@python.org
Unsubscribe: http://mail.python.org/mailman/options/mailman-checkins/mailman-cvs%40progressive-comp.com



[prev in list] [next in list] [prev in thread] [next in thread]