Remove bidirectional syncing patch

[offlineimap] / offlineimap / imaplibutil.py

diff --git a/offlineimap/imaplibutil.py b/offlineimap/imaplibutil.py
index b8b776dbc297a36de7c61f3b1d1be85cd7d26ade..373d227bc2ab0bba33d86505dd8d9dad12776957 100644 (file)
--- a/offlineimap/imaplibutil.py
+++ b/offlineimap/imaplibutil.py
@@ -20,6 +20,10 @@ import re, string, types, binascii, socket, time, random, subprocess, sys, os
 from offlineimap.ui import UIBase
 from imaplib import *
 
+# Import the symbols we need that aren't exported by default
+from imaplib import IMAP4_PORT, IMAP4_SSL_PORT, InternalDate, Mon2num
+
+
 class IMAP4_Tunnel(IMAP4):
     """IMAP4 client class over a tunnel
 
@@ -109,7 +113,6 @@ def new_open(self, host = '', port = IMAP4_PORT):
         self.port = port
         res = socket.getaddrinfo(host, port, socket.AF_UNSPEC,
                                  socket.SOCK_STREAM)
-        self.sock = socket.socket(af, socktype, proto)
 
         # Try each address returned by getaddrinfo in turn until we
         # manage to connect to one.