removed virtual_imaplib2

Now we use the system imaplib2. I am using Debian.

offlineimap/folder/IMAP.py

@@ -24,7 +24,7 @@ import six
 
 from offlineimap import imaputil, imaplibutil, emailutil, OfflineImapError
 from offlineimap import globals
-from offlineimap.virtual_imaplib2 import MonthNames
+from imaplib2 import MonthNames
 from .Base import BaseFolder
 
 # Globals

offlineimap/imaplibutil.py

@@ -29,7 +29,7 @@ import rfc6555
 
 from offlineimap import OfflineImapError
 from offlineimap.ui import getglobalui
-from offlineimap.virtual_imaplib2 import IMAP4, IMAP4_SSL, InternalDate
+from imaplib2 import IMAP4, IMAP4_SSL, InternalDate
 
 
 class UsefulIMAPMixIn:

offlineimap/init.py

@@ -26,7 +26,7 @@ import collections
 from optparse import OptionParser
 
 import offlineimap
-import offlineimap.virtual_imaplib2 as imaplib
+import imaplib2 as imaplib
 
 # Ensure that `ui` gets loaded before `threadutil` in order to
 # break the circular dependency between `threadutil` and `Curses`.
@@ -72,7 +72,7 @@ class OfflineImap:
     """
 
     def get_env_info(self):
-        info = "imaplib2 v%s (%s), Python v%s" % (imaplib.__version__, imaplib.DESC, PYTHON_VERSION)
+        info = "imaplib2 v%s, Python v%s" % (imaplib.__version__, PYTHON_VERSION)
         try:
             import ssl
             info = "%s, %s" % (info, ssl.OPENSSL_VERSION)
@@ -512,7 +512,7 @@ class OfflineImap:
                     profiledir, "%s_%s.prof" % (dt, account.getname())))
 
     def __serverdiagnostics(self, options):
-        self.ui.info("  imaplib2: %s (%s)" % (imaplib.__version__, imaplib.DESC))
+        self.ui.info("  imaplib2: %s" % imaplib.__version__)
         for accountname in self._get_activeaccounts(options):
             account = accounts.Account(self.config, accountname)
             account.serverdiagnostics()

offlineimap/virtual_imaplib2.py

@@ -1,10 +0,0 @@
-from offlineimap.bundled_imaplib2 import *
-import offlineimap.bundled_imaplib2 as imaplib
-
-DESC = "bundled"
-
-# Upstream won't expose those literals to avoid erasing them with "import *" in
-# case they exist.
-__version__ = imaplib.__version__
-__release__ = imaplib.__release__
-__revision__ = imaplib.__revision__