Fix nonblocking socket issues

pinterest · Apr 3, 2020 · 97f1431 · 97f1431
1 parent 3f655dd
commit 97f1431
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pymemcache/client/base.py b/pymemcache/client/base.py
@@ -296,7 +296,8 @@ def _connect(self):
 
             if self.tls_context is not None and self.socket_module.AF_INET:
                 sock = self.tls_context.wrap_socket(
-                    sock, server_hostname=self.server[0]
+                    sock, server_hostname=self.server[0],
+                    do_handshake_on_connect=False,
                 )
         except Exception:
             sock.close()

diff --git a/pymemcache/test/test_integration.py b/pymemcache/test/test_integration.py
@@ -366,6 +366,9 @@ def _unicode_value_in_set():
 
 @pytest.mark.integration()
 def test_tls(client_class, tls_host, tls_port, socket_module, tls_context):
+    if six.PY2:
+        pass
+
     client = client_class(
         (tls_host, tls_port),
         socket_module=socket_module,