Merge pull request mjs#254 from mlorant/master

provide default ssl_context, if not given explicitly [rebased]

Author: mjs

imapclient/tls.py

@@ -30,8 +30,10 @@ def create_default_context(cafile=None, capath=None, cadata=None):
                                           capath=capath,
                                           cadata=cadata)
 
-    wrap_socket = lambda sock, context, host: \
-        context.wrap_socket(sock, server_hostname = host)
+    def wrap_socket(sock, ssl_context, host):
+        if ssl_context is None:
+            ssl_context = create_default_context()
+        return ssl_context.wrap_socket(sock, server_hostname = host)
 
 else:
     # Explicitly check that the required pyOpenSSL is installed. On some