rev 287 - offlineimap/head/offlineimap/folder

Author: jgoerzen
Date: 2002-11-12 09:40:40 -0600 (Tue, 12 Nov 2002)
New Revision: 287

Modified:
   offlineimap/head/offlineimap/folder/IMAP.py
   offlineimap/head/offlineimap/folder/Maildir.py
Log:
Alter handling of messages flagged for deletion -- no longer automatically
delete them if expunge is 0.  In Maildir folder, we will now ignore the T
flag entirely, and just pass it back and forth with IMAP.


Modified: offlineimap/head/offlineimap/folder/Maildir.py
==============================================================================
--- offlineimap/head/offlineimap/folder/Maildir.py	(original)
+++ offlineimap/head/offlineimap/folder/Maildir.py	Tue Nov 12 09:40:40 2002
@@ -116,17 +116,9 @@
             if flagmatch:
                 flags = [x for x in flagmatch.group(1)]
             flags.sort()
-            if 'T' in flags:
-                # Message is marked for deletion; just delete it now.
-                # Otherwise, the T flag will be propogated to the IMAP
-                # server, and then expunged there, and then deleted here.
-                # Might as well just delete it now, to help make things
-                # more robust.
-                os.unlink(file)
-            else:
-                retval[uid] = {'uid': uid,
-                               'flags': flags,
-                               'filename': file}
+            retval[uid] = {'uid': uid,
+                           'flags': flags,
+                           'filename': file}
         return retval
 
     def cachemessagelist(self):

Modified: offlineimap/head/offlineimap/folder/IMAP.py
==============================================================================
--- offlineimap/head/offlineimap/folder/IMAP.py	(original)
+++ offlineimap/head/offlineimap/folder/IMAP.py	Tue Nov 12 09:40:40 2002
@@ -89,9 +89,7 @@
             else:
                 uid = long(options['UID'])
                 flags = imaputil.flagsimap2maildir(options['FLAGS'])
-                # Skip messages already flagged for deletion on the server.
-                if not 'T' in flags:
-                    self.messagelist[uid] = {'uid': uid, 'flags': flags}
+                self.messagelist[uid] = {'uid': uid, 'flags': flags}
 
     def getmessagelist(self):
         return self.messagelist