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

removed virtual_imaplib2

Browse Source 
Now we use the system imaplib2. I am using Debian.
This commit is contained in:
Rodolfo García Peñas (kix) 2020-08-30 22:21:32 +02:00
parent 4d293c8eea
commit d011702b5b
5 changed files with 5 additions and 2528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2513
offlineimap/bundled_imaplib2.py
View File

File diff suppressed because it is too large Load Diff

2
offlineimap/folder/IMAP.py
View File

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

2
offlineimap/imaplibutil.py
View File

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

6
offlineimap/init.py
View File

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

10
offlineimap/virtual_imaplib2.py
View File

@ -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__