From: Michael Witten <mfwitten@MIT.EDU>
Date: Fri, 26 Sep 2008 15:43:57 +0000 (-0500)
Subject: imaplibutil: Remove flagrantly bad use of private attribute
X-Git-Url: https://code.delx.au/offlineimap/commitdiff_plain/5fe379f66d2265f6ddd30f85384daf318f303be9

imaplibutil: Remove flagrantly bad use of private attribute

Frankly, the original code doesn't even make much sense, and
moreover it's not forward compatible with python 2.6, and
furthermore:

    DeprecationWarning: socket.ssl() is deprecated.

So, this commit is just a temporary fix.

Signed-off-by: Michael Witten <mfwitten@mit.edu>
---

diff --git a/offlineimap/imaplibutil.py b/offlineimap/imaplibutil.py
index 23ba654..27ed1fa 100644
--- a/offlineimap/imaplibutil.py
+++ b/offlineimap/imaplibutil.py
@@ -166,10 +166,7 @@ def new_open_ssl(self, host = '', port = IMAP4_SSL_PORT):
         if last_error != 0:
             # FIXME
             raise socket.error(last_error)
-        if sys.version_info[0] <= 2 and sys.version_info[1] <= 2:
-            self.sslobj = socket.ssl(self.sock, self.keyfile, self.certfile)
-        else:
-            self.sslobj = socket.ssl(self.sock._sock, self.keyfile, self.certfile)
+        self.sslobj = socket.ssl(self.sock, self.keyfile, self.certfile)
         self.sslobj = sslwrapper(self.sslobj)
 
 mustquote = re.compile(r"[^\w!#$%&'+,.:;<=>?^`|~-]")