Author: Matti Picus <[email protected]>
Branch: py3.6
Changeset: r96702:5c4489ede2be
Date: 2019-05-27 17:36 +0300
http://bitbucket.org/pypy/pypy/changeset/5c4489ede2be/
Log: fix merge
diff --git a/lib_pypy/_cffi_ssl/_stdssl/__init__.py
b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
--- a/lib_pypy/_cffi_ssl/_stdssl/__init__.py
+++ b/lib_pypy/_cffi_ssl/_stdssl/__init__.py
@@ -222,7 +222,7 @@
def _new__ssl_socket(sslctx, sock, socket_type, server_hostname, inbio,
outbio):
self = _SSLSocket(sslctx)
ctx = sslctx.ctx
- self.owner = ssl_sock # weakref
+ self.owner = None
if server_hostname:
self.server_hostname = server_hostname.decode('idna', 'strict')
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
