From a631ae6a10d4241444d4a9ae5e8b92c17422faf9 Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@redhat.com>
Date: Wed, 17 Nov 2021 21:32:40 +0100
Subject: [PATCH] Vendor imaplib2

---
 offlineimap/folder/IMAP.py | 2 +-
 offlineimap/imaplibutil.py | 2 +-
 offlineimap/init.py        | 2 +-
 requirements.txt           | 1 -
 test/OLItest/TestRunner.py | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py
index c9318c2..f507b06 100644
--- a/offlineimap/folder/IMAP.py
+++ b/offlineimap/folder/IMAP.py
@@ -22,7 +22,7 @@ import time
 from sys import exc_info
 from offlineimap import imaputil, imaplibutil, OfflineImapError
 from offlineimap import globals
-from imaplib2 import MonthNames
+from offlineimap.imaplib2 import MonthNames
 from .Base import BaseFolder
 from email.errors import NoBoundaryInMultipartDefect
 
diff --git a/offlineimap/imaplibutil.py b/offlineimap/imaplibutil.py
index 13b2299..327877e 100644
--- a/offlineimap/imaplibutil.py
+++ b/offlineimap/imaplibutil.py
@@ -26,7 +26,7 @@ from hashlib import sha512, sha384, sha256, sha224, sha1
 import rfc6555
 from offlineimap import OfflineImapError
 from offlineimap.ui import getglobalui
-from imaplib2 import IMAP4, IMAP4_SSL, InternalDate
+from offlineimap.imaplib2 import IMAP4, IMAP4_SSL, InternalDate
 
 try:
     import portalocker
diff --git a/offlineimap/init.py b/offlineimap/init.py
index fe7aaae..97ae141 100644
--- a/offlineimap/init.py
+++ b/offlineimap/init.py
@@ -27,7 +27,7 @@ from optparse import OptionParser
 
 import offlineimap
 from offlineimap.utils.distro_utils import get_os_name
-import imaplib2 as imaplib
+import offlineimap.imaplib2 as imaplib
 
 # Ensure that `ui` gets loaded before `threadutil` in order to
 # break the circular dependency between `threadutil` and `Curses`.
diff --git a/requirements.txt b/requirements.txt
index e580f5f..76e5140 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,6 @@ portalocker[cygwin]
 rfc6555
 distro
 
-imaplib2>=3.5
 urllib3~=1.25.9
 certifi~=2020.6.20
 
diff --git a/test/OLItest/TestRunner.py b/test/OLItest/TestRunner.py
index 28ce5fa..ed05b8a 100644
--- a/test/OLItest/TestRunner.py
+++ b/test/OLItest/TestRunner.py
@@ -19,7 +19,7 @@ import shutil
 import subprocess
 import tempfile
 import random
-import imaplib2 as imaplib
+import offlineimap.imaplib2 as imaplib
 from offlineimap.CustomConfig import CustomConfigParser
 from . import default_conf
 
-- 
1.8.3.1