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

Apply tabspace.diff

Browse Source 
refs #14
This commit is contained in:
John Goerzen 2008-03-03 02:23:50 -06:00
parent 50fc49bf7f
commit 9b8720a4ec
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
offlineimap/repository/IMAP.py
View File

@ -85,30 +85,30 @@ class IMAPRepository(BaseRepository):
return self.imapserver.delim return self.imapserver.delim
def gethost(self): def gethost(self):
host = None host = None
localeval = self.localeval localeval = self.localeval
if self.config.has_option(self.getsection(), 'remotehosteval'): if self.config.has_option(self.getsection(), 'remotehosteval'):
host = self.getconf('remotehosteval') host = self.getconf('remotehosteval')
if host != None: if host != None:
return localeval.eval(host) return localeval.eval(host)
host = self.getconf('remotehost') host = self.getconf('remotehost')
if host != None: if host != None:
return host return host
def getuser(self): def getuser(self):
user = None user = None
localeval = self.localeval localeval = self.localeval
if self.config.has_option(self.getsection(), 'remoteusereval'): if self.config.has_option(self.getsection(), 'remoteusereval'):
user = self.getconf('remoteusereval') user = self.getconf('remoteusereval')
if user != None: if user != None:
return localeval.eval(user) return localeval.eval(user)
user = self.getconf('remoteuser') user = self.getconf('remoteuser')
if user != None: if user != None:
return user return user
try: try:
netrcentry = netrc.netrc().authentificator(self.gethost()) netrcentry = netrc.netrc().authentificator(self.gethost())
except IOError, inst: except IOError, inst:
@ -137,13 +137,13 @@ class IMAPRepository(BaseRepository):
return self.getconfboolean('expunge', 1) return self.getconfboolean('expunge', 1)
def getpassword(self): def getpassword(self):
passwd = None passwd = None
localeval = self.localeval localeval = self.localeval
if self.config.has_option(self.getsection(), 'remotepasseval'): if self.config.has_option(self.getsection(), 'remotepasseval'):
passwd = self.getconf('remotepasseval') passwd = self.getconf('remotepasseval')
if passwd != None: if passwd != None:
return localeval.eval(passwd) return localeval.eval(passwd)
password = self.getconf('remotepass', None) password = self.getconf('remotepass', None)
if password != None: if password != None:
@ -153,7 +153,7 @@ class IMAPRepository(BaseRepository):
fd = open(os.path.expanduser(passfile)) fd = open(os.path.expanduser(passfile))
password = fd.readline().strip() password = fd.readline().strip()
fd.close() fd.close()
return password return password
try: try:
netrcentry = netrc.netrc().authenticators(self.gethost()) netrcentry = netrc.netrc().authenticators(self.gethost())
except IOError, inst: except IOError, inst: