[pypy-commit] pypy py3.6: merge ssl fix into py3.6

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: py3.6
Changeset: r94605:ceff6a6cf97b
Date: 2018-05-16 20:45 -0700
http://bitbucket.org/pypy/pypy/changeset/ceff6a6cf97b/

Log:	merge ssl fix into py3.6

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
@@ -224,7 +224,6 @@
         if server_hostname:
             self.server_hostname = server_hostname.decode('idna', 'strict')
 
-        lib.ERR_get_state()
         lib.ERR_clear_error()
         self.ssl = ssl = ffi.gc(lib.SSL_new(ctx), lib.SSL_free)
 
diff --git a/pypy/doc/whatsnew-pypy3-head.rst b/pypy/doc/whatsnew-pypy3-head.rst
--- a/pypy/doc/whatsnew-pypy3-head.rst
+++ b/pypy/doc/whatsnew-pypy3-head.rst
@@ -12,3 +12,7 @@
 .. branch: py3.5-user-site-impl
 
 Use implementation-specific site directories in sysconfig like in Python2
+
+.. branch: alex_gaynor/remove-an-unneeded-call-into-openssl-th-1526429141011
+
+Remove an unneeded call into OpenSSL, from cpython https://github.com/python/cpython/pull/6887