Author: Matti Picus <[email protected]>
Branch:
Changeset: r95447:03cf0eb3c594
Date: 2018-12-09 11:45 +0200
http://bitbucket.org/pypy/pypy/changeset/03cf0eb3c594/
Log: minimize difference with py3.5
diff --git a/rpython/rlib/_rsocket_rffi.py b/rpython/rlib/_rsocket_rffi.py
--- a/rpython/rlib/_rsocket_rffi.py
+++ b/rpython/rlib/_rsocket_rffi.py
@@ -1082,6 +1082,10 @@
EINPROGRESS = cConfig.EINPROGRESS or cConfig.WSAEINPROGRESS
EWOULDBLOCK = cConfig.EWOULDBLOCK or cConfig.WSAEWOULDBLOCK
EAFNOSUPPORT = cConfig.EAFNOSUPPORT or cConfig.WSAEAFNOSUPPORT
+# vs 2010 and above define both the constansts
+WSAEINPROGRESS = cConfig.WSAEINPROGRESS or cConfig.EINPROGRESS
+WSAEWOULDBLOCK = cConfig.WSAEWOULDBLOCK or cConfig.EWOULDBLOCK
+WSAEAFNOSUPPORT = cConfig.WSAEAFNOSUPPORT or cConfig.EAFNOSUPPORT
EISCONN = cConfig.EISCONN or cConfig.WSAEISCONN
PIPE_BUF = cConfig.PIPE_BUF # may be None
diff --git a/rpython/rlib/rposix_environ.py b/rpython/rlib/rposix_environ.py
--- a/rpython/rlib/rposix_environ.py
+++ b/rpython/rlib/rposix_environ.py
@@ -159,6 +159,8 @@
def envitems_llimpl():
environ = get_environ()
result = []
+ if not environ:
+ return result
i = 0
while environ[i]:
name_value = traits.charp2str(environ[i])
diff --git a/rpython/rlib/rsocket.py b/rpython/rlib/rsocket.py
--- a/rpython/rlib/rsocket.py
+++ b/rpython/rlib/rsocket.py
@@ -707,7 +707,8 @@
address.unlock()
errno = _c.geterrno()
timeout = self.timeout
- if timeout > 0.0 and res < 0 and errno == _c.EWOULDBLOCK:
+ if (timeout > 0.0 and res < 0 and
+ errno in (_c.EWOULDBLOCK, _c.WSAEWOULDBLOCK)):
tv = rffi.make(_c.timeval)
rffi.setintfield(tv, 'c_tv_sec', int(timeout))
rffi.setintfield(tv, 'c_tv_usec',
@@ -733,7 +734,7 @@
return (self.getsockopt_int(_c.SOL_SOCKET,
_c.SO_ERROR), False)
elif n == 0:
- return (_c.EWOULDBLOCK, True)
+ return (_c.WSAEWOULDBLOCK, True)
else:
return (_c.geterrno(), False)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
