tobias/docker-offlineimap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2to3 main

Browse Source
This commit is contained in:
Rodolfo García Peñas (kix)
2020-08-28 03:32:43 +02:00
parent d5564828ea
commit 6ec6111896
20 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
offlineimap/folder/Base.py
View File

@ -286,7 +286,7 @@ class BaseFolder(object):
def ismessagelistempty(self):
"""Is the list of messages empty."""
if len(self.messagelist.keys()) < 1:
if len(list(self.messagelist.keys())) < 1:
return True
return False
@ -1059,14 +1059,14 @@ class BaseFolder(object):
delflaglist[flag] = []
delflaglist[flag].append(uid)
for flag, uids in addflaglist.items():
for flag, uids in list(addflaglist.items()):
self.ui.addingflags(uids, flag, dstfolder)
if self.repository.account.dryrun:
continue # Don't actually add in a dryrun.
dstfolder.addmessagesflags(uids, set(flag))
statusfolder.addmessagesflags(uids, set(flag))
for flag, uids in delflaglist.items():
for flag, uids in list(delflaglist.items()):
self.ui.deletingflags(uids, flag, dstfolder)
if self.repository.account.dryrun:
continue # Don't actually remove in a dryrun.

8
offlineimap/folder/GmailMaildir.py
View File

@ -57,11 +57,11 @@ class GmailMaildirFolder(MaildirFolder):
sorted(statusfolder.getmessageuidlist()):
return True
# Check for flag changes, it's quick on a Maildir.
for (uid, message) in self.getmessagelist().items():
for (uid, message) in list(self.getmessagelist().items()):
if message['flags'] != statusfolder.getmessageflags(uid):
return True
# check for newer mtimes. it is also fast
for (uid, message) in self.getmessagelist().items():
for (uid, message) in list(self.getmessagelist().items()):
if message['mtime'] > statusfolder.getmessagemtime(uid):
return True
return False # Nope, nothing changed.
@ -302,7 +302,7 @@ class GmailMaildirFolder(MaildirFolder):
dellabellist[lb] = []
dellabellist[lb].append(uid)
for lb, uids in addlabellist.items():
for lb, uids in list(addlabellist.items()):
# Bail out on CTRL-C or SIGTERM.
if offlineimap.accounts.Account.abort_NOW_signal.is_set():
break
@ -313,7 +313,7 @@ class GmailMaildirFolder(MaildirFolder):
dstfolder.addmessageslabels(uids, set([lb]))
statusfolder.addmessageslabels(uids, set([lb]))
for lb, uids in dellabellist.items():
for lb, uids in list(dellabellist.items()):
# Bail out on CTRL-C or SIGTERM.
if offlineimap.accounts.Account.abort_NOW_signal.is_set():
break

6
offlineimap/folder/LocalStatus.py
View File

@ -177,7 +177,7 @@ class LocalStatusFolder(BaseFolder):
with self.savelock:
cachefd = open(self.filename + ".tmp", "wt")
cachefd.write((self.magicline % self.cur_version) + "\n")
for msg in self.messagelist.values():
for msg in list(self.messagelist.values()):
flags = ''.join(sorted(msg['flags']))
labels = ', '.join(sorted(msg['labels']))
cachefd.write("%s|%s|%d|%s\n" % (msg['uid'], flags, msg['mtime'], labels))
@ -237,7 +237,7 @@ class LocalStatusFolder(BaseFolder):
def savemessageslabelsbulk(self, labels):
"""Saves labels from a dictionary in a single database operation."""
for uid, lb in labels.items():
for uid, lb in list(labels.items()):
self.messagelist[uid]['labels'] = lb
self.save()
@ -257,7 +257,7 @@ class LocalStatusFolder(BaseFolder):
def savemessagesmtimebulk(self, mtimes):
"""Saves mtimes from the mtimes dictionary in a single database operation."""
for uid, mt in mtimes.items():
for uid, mt in list(mtimes.items()):
self.messagelist[uid]['mtime'] = mt
self.save()

10
offlineimap/folder/LocalStatusSQLite.py
View File

@ -284,7 +284,7 @@ class LocalStatusSQLiteFolder(BaseFolder):
with self._databaseFileLock.getLock():
data = []
for uid, msg in self.messagelist.items():
for uid, msg in list(self.messagelist.items()):
mtime = msg['mtime']
flags = ''.join(sorted(msg['flags']))
labels = ', '.join(sorted(msg['labels']))
@ -391,9 +391,9 @@ class LocalStatusSQLiteFolder(BaseFolder):
Saves labels from a dictionary in a single database operation.
"""
data = [(', '.join(sorted(l)), uid) for uid, l in labels.items()]
data = [(', '.join(sorted(l)), uid) for uid, l in list(labels.items())]
self.__sql_write('UPDATE status SET labels=? WHERE id=?', data, executemany=True)
for uid, l in labels.items():
for uid, l in list(labels.items()):
self.messagelist[uid]['labels'] = l
@ -424,9 +424,9 @@ class LocalStatusSQLiteFolder(BaseFolder):
def savemessagesmtimebulk(self, mtimes):
"""Saves mtimes from the mtimes dictionary in a single database operation."""
data = [(mt, uid) for uid, mt in mtimes.items()]
data = [(mt, uid) for uid, mt in list(mtimes.items())]
self.__sql_write('UPDATE status SET mtime=? WHERE id=?', data, executemany=True)
for uid, mt in mtimes.items():
for uid, mt in list(mtimes.items()):
self.messagelist[uid]['mtime'] = mt

6
offlineimap/folder/Maildir.py
View File

@ -227,7 +227,7 @@ class MaildirFolder(BaseFolder):
positive_uids = [uid for uid in retval if uid > 0]
if positive_uids:
min_uid = min(positive_uids)
for uid in date_excludees.keys():
for uid in list(date_excludees.keys()):
if uid > min_uid:
# This message was originally excluded because of
# its date. It is re-included now because we want all
@ -245,7 +245,7 @@ class MaildirFolder(BaseFolder):
sorted(statusfolder.getmessageuidlist()):
return True
# Also check for flag changes, it's quick on a Maildir.
for (uid, message) in self.getmessagelist().items():
for (uid, message) in list(self.getmessagelist().items()):
if message['flags'] != statusfolder.getmessageflags(uid):
return True
return False # Nope, nothing changed.
@ -523,7 +523,7 @@ class MaildirFolder(BaseFolder):
"""
oldfmd5 = md5(self.name).hexdigest()
msglist = self._scanfolder()
for mkey, mvalue in msglist.items():
for mkey, mvalue in list(msglist.items()):
filename = os.path.join(self.getfullname(), mvalue['filename'])
match = re.search("FMD5=([a-fA-F0-9]+)", filename)
if match is None:

8
offlineimap/folder/UIDMaps.py
View File

@ -110,7 +110,7 @@ class MappedIMAPFolder(IMAPFolder):
except NameError:
pass # Windows...
with open(mapfilenametmp, 'wt') as mapfilefd:
for (key, value) in self.diskl2r.items():
for (key, value) in list(self.diskl2r.items()):
mapfilefd.write("%d:%d\n"% (key, value))
if self.dofsync():
fsync(mapfilefd)
@ -139,7 +139,7 @@ class MappedIMAPFolder(IMAPFolder):
with self.maplock:
# OK. Now we've got a nice list. First, delete things from the
# summary that have been deleted from the folder.
for luid in self.diskl2r.keys():
for luid in list(self.diskl2r.keys()):
if not luid in reallist:
ruid = self.diskl2r[luid]
#XXX: the following KeyError are sightly unexpected. This
@ -166,7 +166,7 @@ class MappedIMAPFolder(IMAPFolder):
self.r2l = self.diskr2l.copy()
self.l2r = self.diskl2r.copy()
for luid in reallist.keys():
for luid in list(reallist.keys()):
if not luid in self.l2r:
ruid = nextneg
nextneg -= 1
@ -192,7 +192,7 @@ class MappedIMAPFolder(IMAPFolder):
# This implementation overrides the one in BaseFolder, as it is
# much more efficient for the mapped case.
return self.r2l.keys()
return list(self.r2l.keys())
# Interface from BaseFolder
def getmessagecount(self):