Author: Matti Picus <matti.pi...@gmail.com>
Branch: py3.6
Changeset: r98202:5570fbfd5401
Date: 2019-12-01 06:57 +0200
http://bitbucket.org/pypy/pypy/changeset/5570fbfd5401/
Log: merge default into py3.6
diff --git a/lib_pypy/_cffi_ssl/_stdssl/error.py
b/lib_pypy/_cffi_ssl/_stdssl/error.py
--- a/lib_pypy/_cffi_ssl/_stdssl/error.py
+++ b/lib_pypy/_cffi_ssl/_stdssl/error.py
@@ -27,13 +27,14 @@
if self.strerror and isinstance(self.strerror, str):
return self.strerror
return str(self.args)
-# these are expected on socket as well
-socket.sslerror = SSLError
-for v in [ 'SSL_ERROR_ZERO_RETURN', 'SSL_ERROR_WANT_READ',
- 'SSL_ERROR_WANT_WRITE', 'SSL_ERROR_WANT_X509_LOOKUP', 'SSL_ERROR_SYSCALL',
- 'SSL_ERROR_SSL', 'SSL_ERROR_WANT_CONNECT', 'SSL_ERROR_EOF',
- 'SSL_ERROR_INVALID_ERROR_CODE' ]:
- setattr(socket, v, locals()[v])
+# these are expected on socket in python2 as well
+if sys.version_info[0] < 3:
+ socket.sslerror = SSLError
+ for v in [ 'SSL_ERROR_ZERO_RETURN', 'SSL_ERROR_WANT_READ',
+ 'SSL_ERROR_WANT_WRITE', 'SSL_ERROR_WANT_X509_LOOKUP',
'SSL_ERROR_SYSCALL',
+ 'SSL_ERROR_SSL', 'SSL_ERROR_WANT_CONNECT', 'SSL_ERROR_EOF',
+ 'SSL_ERROR_INVALID_ERROR_CODE' ]:
+ setattr(socket, v, locals()[v])
class SSLZeroReturnError(SSLError):
""" SSL/TLS session closed cleanly. """
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -5,4 +5,6 @@
.. this is a revision shortly after release-pypy-7.3.0
.. startrev: dbbbae99135f
+.. branch: backport-decode_timeval_ns-py3.7
+Backport ``rtime.decode_timeval_ns`` from py3.7 to rpython
diff --git a/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
b/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
--- a/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
+++ b/pypy/module/pypyjit/test_pypy_c/test_micronumpy.py
@@ -4,8 +4,10 @@
from pypy.module.pypyjit.test_pypy_c.test_00_model import BaseTestPyPyC
from rpython.rlib.rawstorage import misaligned_is_fine
+IS_X86 = platform.machine().startswith('x86') or platform.machine() == 'i686'
+
def no_vector_backend():
- if platform.machine().startswith('x86'):
+ if IS_X86:
from rpython.jit.backend.x86.detect_feature import detect_sse4_2
if sys.maxsize < 2**31:
return True
@@ -19,7 +21,7 @@
return True
def align_check(input):
- if platform.machine().startswith('x86'):
+ if IS_X86:
return ""
if sys.maxsize > 2**32:
mask = 7
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
