From bb8546e846a23bc2b26af587c95073f5cb6192a4 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 27 Apr 2011 12:15:49 +0200 Subject: [PATCH 1/4] Whitespace fixes Just clean up lines which end in whitespaces. Also adapt the copyright to the current year while touching the file. Signed-off-by: Sebastian Spaeth Signed-off-by: Nicolas Sebrecht --- offlineimap/folder/Base.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/offlineimap/folder/Base.py b/offlineimap/folder/Base.py index 991a39b..b3fd747 100644 --- a/offlineimap/folder/Base.py +++ b/offlineimap/folder/Base.py @@ -1,6 +1,5 @@ # Base folder support -# Copyright (C) 2002 John Goerzen -# +# Copyright (C) 2002-2011 John Goerzen & contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,7 +24,7 @@ import traceback class BaseFolder: def __init__(self): self.ui = getglobalui() - + def getname(self): """Returns name""" return self.name @@ -74,7 +73,7 @@ class BaseFolder: return self.getroot() + self.getsep() + self.getname() else: return self.getname() - + def getfolderbasename(self): foldername = self.getname() foldername = foldername.replace(self.repository.getsep(), '.') @@ -97,7 +96,7 @@ class BaseFolder: def _getuidfilename(self): return os.path.join(self.repository.getuiddir(), self.getfolderbasename()) - + def getsaveduidvalidity(self): if hasattr(self, '_base_saved_uidvalidity'): return self._base_saved_uidvalidity @@ -242,7 +241,7 @@ class BaseFolder: message = None flags = self.getmessageflags(uid) rtime = self.getmessagetime(uid) - + if uid > 0 and dstfolder.uidexists(uid): # dst has message with that UID already, only update status statusfolder.savemessage(uid, None, flags, rtime) @@ -250,7 +249,7 @@ class BaseFolder: self.ui.copyingmessage(uid, self, [dstfolder]) # If any of the destinations actually stores the message body, - # load it up. + # load it up. if dstfolder.storesmessages(): message = self.getmessage(uid) @@ -380,7 +379,7 @@ class BaseFolder: self.ui.deletingflags(delflaglist[flag], flag, dstfolder) dstfolder.deletemessagesflags(delflaglist[flag], [flag]) statusfolder.deletemessagesflags(delflaglist[flag], [flag]) - + def syncmessagesto(self, dstfolder, statusfolder): """Syncs messages in this folder to the destination dstfolder. From 074ea14cf1141ff3f20c6562fac0c60b8d257024 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 27 Apr 2011 12:15:50 +0200 Subject: [PATCH 2/4] Make str() of Account() be its name So we can simply hand an account instance to error messages rather than having to call Account().getname() all the time. This is not used yet. Signed-off-by: Sebastian Spaeth Signed-off-by: Nicolas Sebrecht --- offlineimap/accounts.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/offlineimap/accounts.py b/offlineimap/accounts.py index 7edfa37..a22bf7f 100644 --- a/offlineimap/accounts.py +++ b/offlineimap/accounts.py @@ -125,6 +125,9 @@ class Account(CustomConfig.ConfigHelperMixin): def getname(self): return self.name + def __str__(self): + return self.name + def getsection(self): return 'Account ' + self.getname() From 3e5d6f54501ac7335ad81836914454c10211b4f7 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 27 Apr 2011 12:15:51 +0200 Subject: [PATCH 3/4] Make str() of Repository() be its name So we can simply hand a repository instance to error messages rather than having to call Repository().getname() all the time. This is not used yet. Signed-off-by: Sebastian Spaeth Signed-off-by: Nicolas Sebrecht --- offlineimap/repository/Base.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/offlineimap/repository/Base.py b/offlineimap/repository/Base.py index 482cc2d..594f864 100644 --- a/offlineimap/repository/Base.py +++ b/offlineimap/repository/Base.py @@ -72,6 +72,9 @@ class BaseRepository(CustomConfig.ConfigHelperMixin): def getname(self): return self.name + def __str__(self): + return self.name + def getuiddir(self): return self.uiddir From e01968973decba461678836856d3ea4862885202 Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Wed, 27 Apr 2011 12:15:52 +0200 Subject: [PATCH 4/4] Use "%s" % account rather than account.name uncritical patch, but we can make the code a bit shorter so why not. Signed-off-by: Sebastian Spaeth Signed-off-by: Nicolas Sebrecht --- offlineimap/accounts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/offlineimap/accounts.py b/offlineimap/accounts.py index a22bf7f..f94a55c 100644 --- a/offlineimap/accounts.py +++ b/offlineimap/accounts.py @@ -256,7 +256,7 @@ class SyncableAccount(Account): thread = InstanceLimitedThread(\ instancename = 'FOLDER_' + self.remoterepos.getname(), target = syncfolder, - name = "Folder sync [%s]" % self.name, + name = "Folder sync [%s]" % self, args = (self.name, remoterepos, remotefolder, localrepos, statusrepos, quick)) thread.setDaemon(1)