offlineimap rev 532

You are receiving this message because
all commits get sent to this address.

Author: jgoerzen
Date: 2003-07-27 18:31:15 -0500 (Sun, 27 Jul 2003)
New Revision: 532

Modified:
  offlineimap/branches/twisted/offlineimap/accounts.py
  offlineimap/branches/twisted/offlineimap/folder/Base.py
  offlineimap/branches/twisted/offlineimap/folder/Maildir.py

Log:
Corrected some return values and general bugs


Diff:
Modified: offlineimap/branches/twisted/offlineimap/accounts.py
==============================================================================
--- offlineimap/branches/twisted/offlineimap/accounts.py	2003-07-27 23:21:43 UTC (rev 531)
+++ offlineimap/branches/twisted/offlineimap/accounts.py	2003-07-27 23:31:15 UTC (rev 532)
@@ -180,7 +180,6 @@
                       replace(self.remoterepos.getsep(),
                               self.localrepos.getsep()))
         d = self.local_cache()
-        d.addCallback(self.local_cache)
         d.addCallback(self.status_load)
         d.addCallback(self.status_cache)
         d.addCallback(self.load_validities)
@@ -222,20 +221,20 @@
     def load_validities(self, d):
         self.validities = {}
 
-        dl = defer.DeferredList()
+        dl = defer.DeferredList([])
 
         for folder, name in ((self.localfolder, 'local'),
                              (self.remotefolder, 'remote')):
             d = folder.getuidvalidity()
-            d.addCallback(self._set_validities, ('%s_uidvalidity' % name))
+            d.addCallback(self._set_validities, '%s_uidvalidity' % name)
             dl.addDeferred(d)
 
             d = folder.isuidvalidityok()
-            d.addCallback(self._set_validities, ('%s_isuidvalidityok' % name))
+            d.addCallback(self._set_validities, '%s_isuidvalidityok' % name)
             dl.addDeferred(d)
         return dl
 
-    def _set_validities(self, name, value):
+    def _set_validities(self, value, name):
         self.validities[name] = value
 
     def check_validities(self, d):

Modified: offlineimap/branches/twisted/offlineimap/folder/Base.py
==============================================================================
--- offlineimap/branches/twisted/offlineimap/folder/Base.py	2003-07-27 23:21:43 UTC (rev 531)
+++ offlineimap/branches/twisted/offlineimap/folder/Base.py	2003-07-27 23:31:15 UTC (rev 532)
@@ -79,10 +79,13 @@
 
     def isuidvalidityok(self):
         if self.getsaveduidvalidity() != None:
-            return self.getsaveduidvalidity() == self.getuidvalidity()
+            retval = self.getsaveduidvalidity() == self.getuidvalidity()
+            return rd(retval)
         else:
-            self.saveuidvalidity()
-            return 1
+            d = self.saveuidvalidity()
+            # This has the effect of returning '1' to the caller.
+            d.addCallback(lambda x: 1)
+            return d
 
     def _getuidfilename(self):
         return os.path.join(self.repository.getuiddir(),
@@ -101,7 +104,11 @@
         return self._base_saved_uidvalidity
 
     def saveuidvalidity(self):
-        newval = self.getuidvalidity()
+        d = self.getuidvalidity()
+        d.addCallback(self.saveuidvalidity_worker)
+        return d
+
+    def saveuidvalidity_worker(self, newval):
         uidfilename = self._getuidfilename()
         self.uidlock.acquire()
         try:

Modified: offlineimap/branches/twisted/offlineimap/folder/Maildir.py
==============================================================================
--- offlineimap/branches/twisted/offlineimap/folder/Maildir.py	2003-07-27 23:21:43 UTC (rev 531)
+++ offlineimap/branches/twisted/offlineimap/folder/Maildir.py	2003-07-27 23:31:15 UTC (rev 532)
@@ -66,7 +66,7 @@
     def getuidvalidity(self):
         """Maildirs have no notion of uidvalidity, so we just return a magic
         token."""
-        return 42
+        return rd(42)
 
     def _scanfolder(self):
         """Cache the message list.  Maildir flags are: