Revert "completed: * fixes behaviour when changing flags, without corresp. rights...

[offlineimap] / offlineimap / folder / IMAP.py

diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py
index 9ed75ef47557a4433342a2df8415d28924d7ca8f..efba10c47fe8852ed7601cd3b411f19975007810 100644 (file)
--- a/offlineimap/folder/IMAP.py
+++ b/offlineimap/folder/IMAP.py
@@ -365,30 +365,12 @@ class IMAPFolder(BaseFolder):
         
         imapobj = self.imapserver.acquireconnection()
         try:
-            # Making sure, that we have the necessary rights
-            # ensuring that we access readonly: python's braindead imaplib.py
-            # otherwise might raise an exception during the myrights() call
-            imapobj.select(self.getfullname(),readonly=1)
-            myrights = imapobj.myrights(self.getfullname())[1][0].split()[1]
-           if 'T' in flags and not 'd' in myrights or \
-                   'S' in flags and not 's' in myrights or \
-                   filter(lambda x: x not in 'TS', flags) and not 'w' in myrights:
-               # no delete/expunge right, but needed or
-               # no store seen right, but needed or
-               # no write right, but needed
-                UIBase.getglobalui().flagstoreadonly(self, uidlist, flags)
-                return
-
             try:
                 imapobj.select(self.getfullname())
             except imapobj.readonly:
-                # Above we made sure, we have the necessary rights.
-                # Ugly hack, to prevent an unnecessary exception:
-                #  readonly: mailbox status changed to READ-ONLY
-                # imaplib should take care of that itself.
-                # The connection is anyway released below, so we dont need to
-                # undo the hack.
-                imapobj.is_readonly = True
+               # unsure, whether this can be reached
+                UIBase.getglobalui().flagstoreadonly(self, uidlist, flags)
+                return
             r = imapobj.uid('store',
                             imaputil.listjoin(uidlist),
                             operation + 'FLAGS',
@@ -410,9 +392,9 @@ class IMAPFolder(BaseFolder):
             if not ('UID' in attributehash and 'FLAGS' in attributehash):
                 # Compensate for servers that don't return a UID attribute.
                 continue
-            flags = attributehash['FLAGS']
+            lflags = attributehash['FLAGS']
             uid = long(attributehash['UID'])
-            self.messagelist[uid]['flags'] = imaputil.flagsimap2maildir(flags)
+            self.messagelist[uid]['flags'] = imaputil.flagsimap2maildir(lflags)
             try:
                 needupdate.remove(uid)
             except ValueError:          # Let it slide if it's not in the list
@@ -443,17 +425,12 @@ class IMAPFolder(BaseFolder):
         self.addmessagesflags_noconvert(uidlist, ['T'])
         imapobj = self.imapserver.acquireconnection()
         try:
-            # Making sure, that we have the necessary rights
-            # ensuring that we access readonly: python's braindead imaplib.py
-            # otherwise might raise an exception during the myrights() call
-            imapobj.select(self.getfullname(),readonly=1)
-            if not 'd' in imapobj.myrights(self.getfullname())[1][0].split()[1]:
-                # no delete/expunge rights
+            try:
+                imapobj.select(self.getfullname())
+            except imapobj.readonly:
                 UIBase.getglobalui().deletereadonly(self, uidlist)
                 return
-
             if self.expunge:
-                imapobj.select(self.getfullname())
                 assert(imapobj.expunge()[0] == 'OK')
         finally:
             self.imapserver.releaseconnection(imapobj)