Don't pass in 'root' as para to LocalStatusFolders

They have the Repository() which contains the root, so no need to pass
it in as an extra parameter. Rename repository.LocalStatus()'s
self.directory to self.root for consistency with other backends.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
Sebastian Spaeth
2011-09-16 10:54:25 +02:00
committed by Nicolas Sebrecht
parent ee75e0921f
commit 80e87d0d99
3 changed files with 14 additions and 18 deletions

View File

@ -26,11 +26,10 @@ except NameError:
magicline = "OFFLINEIMAP LocalStatus CACHE DATA - DO NOT MODIFY - FORMAT 1"
class LocalStatusFolder(BaseFolder):
def __init__(self, root, name, repository):
def __init__(self, name, repository):
super(LocalStatusFolder, self).__init__(name, repository)
self.root = root
self.sep = '.'
self.filename = os.path.join(root, self.getfolderbasename())
self.filename = os.path.join(self.getroot(), self.getfolderbasename())
self.messagelist = {}
self.savelock = threading.Lock()
self.doautosave = self.config.getdefaultboolean("general", "fsync",
@ -47,7 +46,7 @@ class LocalStatusFolder(BaseFolder):
return self.name
def getroot(self):
return self.root
return self.repository.root
def getsep(self):
return self.sep

View File

@ -46,10 +46,8 @@ class LocalStatusSQLiteFolder(LocalStatusFolder):
#current version of our db format
cur_version = 1
def __init__(self, root, name, repository):
super(LocalStatusSQLiteFolder, self).__init__(root, name,
repository)
def __init__(self, name, repository):
super(LocalStatusSQLiteFolder, self).__init__(name, repository)
# dblock protects against concurrent writes in same connection
self._dblock = Lock()
#Try to establish connection, no need for threadsafety in __init__