2to3 main

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

View File

@ -197,7 +197,7 @@ class BaseRepository(CustomConfig.ConfigHelperMixin):
local_hash[folder.getname()] = folder
# Create new folders from remote to local.
for remote_name, remote_folder in remote_hash.items():
for remote_name, remote_folder in list(remote_hash.items()):
# Don't create on local_repo, if it is readonly.
if not local_repo.should_create_folders():
break
@ -205,7 +205,7 @@ class BaseRepository(CustomConfig.ConfigHelperMixin):
# Apply remote nametrans and fix serparator.
local_name = remote_folder.getvisiblename().replace(
remote_repo.getsep(), local_repo.getsep())
if remote_folder.sync_this and not local_name in local_hash.keys():
if remote_folder.sync_this and not local_name in list(local_hash.keys()):
try:
local_repo.makefolder(local_name)
# Need to refresh list.
@ -219,7 +219,7 @@ class BaseRepository(CustomConfig.ConfigHelperMixin):
local_repo.getsep(), status_repo.getsep()))
# Create new folders from local to remote.
for local_name, local_folder in local_hash.items():
for local_name, local_folder in list(local_hash.items()):
if not remote_repo.should_create_folders():
# Don't create missing folder on readonly repo.
break
@ -227,7 +227,7 @@ class BaseRepository(CustomConfig.ConfigHelperMixin):
# Apply reverse nametrans and fix serparator.
remote_name = local_folder.getvisiblename().replace(
local_repo.getsep(), remote_repo.getsep())
if local_folder.sync_this and not remote_name in remote_hash.keys():
if local_folder.sync_this and not remote_name in list(remote_hash.keys()):
# Would the remote filter out the new folder name? In this case
# don't create it.
if not remote_repo.should_sync_folder(remote_name):

View File

@ -57,13 +57,13 @@ class LocalStatusRepository(BaseRepository):
return self.LocalStatusFolderClass(foldername, self) # Instanciate.
def setup_backend(self, backend):
if backend in self.backends.keys():
if backend in list(self.backends.keys()):
self._backend = backend
self.root = self.backends[backend]['root']
self.LocalStatusFolderClass = self.backends[backend]['class']
def import_other_backend(self, folder):
for bk, dic in self.backends.items():
for bk, dic in list(self.backends.items()):
# Skip folder's own type.
if dic['class'] == type(folder):
continue

View File

@ -20,7 +20,7 @@ from sys import exc_info
try:
from configparser import NoSectionError
except ImportError: #python2
from ConfigParser import NoSectionError
from configparser import NoSectionError
from offlineimap.repository.IMAP import IMAPRepository, MappedIMAPRepository
from offlineimap.repository.Gmail import GmailRepository