--info displays the imaplib2 version and whether it's the bundled or system one
Signed-off-by: Nicolas Sebrecht <nicolas.s-dev@laposte.net>
This commit is contained in:
parent
9902a116c0
commit
fd0198027a
@ -452,6 +452,7 @@ class OfflineImap(object):
|
||||
account.syncrunner()
|
||||
|
||||
def __serverdiagnostics(self, options):
|
||||
self.ui.info(" imaplib2: %s (%s)"% (imaplib.__version__, imaplib.DESC))
|
||||
activeaccounts = self.config.get("general", "accounts")
|
||||
if options.accounts:
|
||||
activeaccounts = options.accounts
|
||||
|
@ -22,6 +22,8 @@ this virtual_imaplib2 or we might go into troubles.
|
||||
|
||||
"""
|
||||
|
||||
DESC = None
|
||||
|
||||
_SUPPORTED_RELEASE = 2
|
||||
_SUPPORTED_REVISION = 53
|
||||
|
||||
@ -35,10 +37,12 @@ try:
|
||||
int(imaplib.__revision__) < _SUPPORTED_REVISION):
|
||||
raise ImportError("The provided imaplib2 version '%s' is not supported"%
|
||||
imaplib.__version__)
|
||||
DESC = "system"
|
||||
except (ImportError, NameError) as e:
|
||||
try:
|
||||
from offlineimap.bundled_imaplib2 import *
|
||||
import offlineimap.bundled_imaplib2 as imaplib
|
||||
DESC = "bundled"
|
||||
except:
|
||||
print("Error while trying to import system imaplib2: %s"% e)
|
||||
raise
|
||||
@ -48,3 +52,4 @@ except (ImportError, NameError) as e:
|
||||
InternalDate = imaplib.InternalDate
|
||||
Mon2num = imaplib.Mon2num
|
||||
MonthNames = imaplib.MonthNames
|
||||
__version__ = imaplib.__version__
|
||||
|
Loading…
Reference in New Issue
Block a user