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

Merge pull request #51 from sudipm-mukherjee/fix_remotepassfile

Browse Source 
Right format for password from remotepassfile
This commit is contained in:
Rodolfo García Peñas (kix) 2021-02-18 18:40:06 +01:00 committed by GitHub
commit 76c7a723db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
offlineimap/repository/IMAP.py
View File

@ -601,7 +601,20 @@ class IMAPRepository(BaseRepository):
encoding='utf-8') encoding='utf-8')
password = file_desc.readline().strip() password = file_desc.readline().strip()
file_desc.close() file_desc.close()
return password.encode('UTF-8')
# We need a str password
if isinstance(password, bytes):
return password.decode(encoding='utf-8')
elif isinstance(password, str):
return password
# If is not bytes or str, we have a problem
raise OfflineImapError("Could not get a right password format for"
" repository %s. Type found: %s. "
"Please, open a bug." %
(self.name, type(password)),
OfflineImapError.ERROR.FOLDER)
# 4. Read password from ~/.netrc. # 4. Read password from ~/.netrc.
try: try:
netrcentry = netrc.netrc().authenticators(self.gethost()) netrcentry = netrc.netrc().authenticators(self.gethost())