[PATCH 03/13] Import imaplib2 instead of imaplib

[Ethan Glasser-Camp]

---
 offlineimap/folder/IMAP.py |    2 +-
 offlineimap/imaplibutil.py |    4 ++--
 offlineimap/imapserver.py  |    2 +-
 offlineimap/init.py        |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/offlineimap/folder/IMAP.py b/offlineimap/folder/IMAP.py
index 77d6f36..db1bdae 100644
--- a/offlineimap/folder/IMAP.py
+++ b/offlineimap/folder/IMAP.py
@@ -16,7 +16,7 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-import imaplib
+from offlineimap import imaplib2 as imaplib
 import rfc822
 import string
 import random
diff --git a/offlineimap/imaplibutil.py b/offlineimap/imaplibutil.py
index cf82996..7f1b26c 100644
--- a/offlineimap/imaplibutil.py
+++ b/offlineimap/imaplibutil.py
@@ -17,10 +17,10 @@
 
 import re, socket, time, subprocess
 from offlineimap.ui import getglobalui
-from imaplib import *
+from offlineimap.imaplib2 import *
 
 # Import the symbols we need that aren't exported by default
-from imaplib import IMAP4_PORT, IMAP4_SSL_PORT, InternalDate, Mon2num
+from offlineimap.imaplib2 import IMAP4_PORT, IMAP4_SSL_PORT, InternalDate, Mon2num
 
 try:
     import ssl
diff --git a/offlineimap/imapserver.py b/offlineimap/imapserver.py
index 2a9f247..10d8fe3 100644
--- a/offlineimap/imapserver.py
+++ b/offlineimap/imapserver.py
@@ -16,7 +16,7 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-import imaplib
+from offlineimap import imaplib2 as imaplib
 from offlineimap import imaplibutil, imaputil, threadutil
 from offlineimap.ui import getglobalui
 from threading import *
diff --git a/offlineimap/init.py b/offlineimap/init.py
index 309a757..da378b8 100644
--- a/offlineimap/init.py
+++ b/offlineimap/init.py
@@ -19,7 +19,7 @@
 import os
 import sys
 import threading
-import imaplib
+import offlineimap.imaplib2 as imaplib
 import signal
 import socket
 import logging
-- 
1.7.1