Skip to content

G
gevent
Commit 07891830 authored by Jason Madden's avatar Jason Madden
Browse files
Options

More Python 3.8 fixes, and another attempt at the PyPy fix.

parent 2ef0a109
Show whitespace changes
Inline Side-by-side
Showing with 243 additions and 214 deletions
scripts/install.sh
View file @ 07891830
......@@ -29,8 +29,8 @@ else
# and it's pretty large.
# So if we need to incorporate changes from pyenv, either temporarily
# turn this back on, or remove the Travis caches.
git fetch || echo "Fetch failed to complete. Ignoring"
git reset --hard origin/master
# git fetch || echo "Fetch failed to complete. Ignoring"
# git reset --hard origin/master
cd $back
fi
......
src/gevent/_ssl3.py
View file @ 07891830
......@@ -162,7 +162,7 @@ class SSLContext(orig_SSLContext):
super(orig_SSLContext, orig_SSLContext).sni_callback.__set__(self, value)
else:
# In newer versions, this just sets sni_callback.
def set_servername_callback(self, cb):
def set_servername_callback(self, cb): # pylint:disable=arguments-differ
if cb and callable(cb):
cb = _Callback(cb)
super().set_servername_callback(cb)
......
src/gevent/subprocess.py
View file @ 07891830
......@@ -1007,10 +1007,15 @@ class Popen(object):
# Process startup details
if startupinfo is None:
startupinfo = STARTUPINFO()
elif hasattr(startupinfo, '_copy'):
elif hasattr(startupinfo, 'copy'):
# bpo-34044: Copy STARTUPINFO since it is modified below,
# so the caller can reuse it multiple times.
startupinfo = startupinfo.copy()
elif hasattr(startupinfo, '_copy'):
# When the fix was backported to Python 3.7, copy() was
# made private as _copy.
startupinfo = startupinfo._copy()
use_std_handles = -1 not in (p2cread, c2pwrite, errwrite)
if use_std_handles:
startupinfo.dwFlags |= STARTF_USESTDHANDLES
......
src/gevent/tests/test__makefile_ref.py
View file @ 07891830
......@@ -111,7 +111,6 @@ class Test(greentest.TestCase):
def make_open_socket(self):
s = socket.socket()
s.bind(DEFAULT_BIND_ADDR_TUPLE)
self._close_on_teardown(s)
if WIN or greentest.LINUX:
# Windows and linux (with psutil) doesn't show as open until
# we call listen (linux with lsof accepts either)
......@@ -119,40 +118,27 @@ class Test(greentest.TestCase):
self.assert_open(s, s.fileno())
return s
if CPYTHON and PY2:
# Keeping raw sockets alive keeps SSL sockets
# from being closed too, at least on CPython2, so we
# need to use weakrefs.
# In contrast, on PyPy, *only* having a weakref lets the
# original socket die and leak
def _close_on_teardown(self, resource):
self.close_on_teardown.append(weakref.ref(resource))
return resource
def _tearDownCloseOnTearDown(self):
self.close_on_teardown = [r() for r in self.close_on_teardown if r() is not None]
super(Test, self)._tearDownCloseOnTearDown()
# Sometimes its this one, sometimes it's test_ssl. No clue why or how.
@greentest.skipOnAppVeyor("This sometimes times out for no apparent reason.")
class TestSocket(Test):
def test_simple_close(self):
s = self.make_open_socket()
with Closing() as closer:
s = closer(self.make_open_socket())
fileno = s.fileno()
s.close()
self.assert_closed(s, fileno)
def test_makefile1(self):
s = self.make_open_socket()
with Closing() as closer:
s = closer(self.make_open_socket())
fileno = s.fileno()
f = s.makefile()
f = closer(s.makefile())
self.assert_open(s, fileno)
s.close()
# Under python 2, this closes socket wrapper object but not the file descriptor;
# under python 3, both stay open
s.close()
if PY3:
self.assert_open(s, fileno)
else:
......@@ -163,10 +149,11 @@ class TestSocket(Test):
self.assert_closed(fileno)
def test_makefile2(self):
s = self.make_open_socket()
with Closing() as closer:
s = closer(self.make_open_socket())
fileno = s.fileno()
self.assert_open(s, fileno)
f = s.makefile()
f = closer(s.makefile())
self.assert_open(s)
self.assert_open(s, fileno)
f.close()
......@@ -176,46 +163,39 @@ class TestSocket(Test):
self.assert_closed(s, fileno)
def test_server_simple(self):
listener = tcp_listener(backlog=1)
with Closing() as closer:
listener = closer(tcp_listener(backlog=1))
port = listener.getsockname()[1]
connector = socket.socket()
self._close_on_teardown(connector)
connector = closer(socket.socket())
def connect():
connector.connect((DEFAULT_CONNECT, port))
t = threading.Thread(target=connect)
t.start()
closer.running_task(threading.Thread(target=connect))
try:
client_socket, _addr = listener.accept()
client_socket = closer.accept(listener)
fileno = client_socket.fileno()
self.assert_open(client_socket, fileno)
client_socket.close()
self.assert_closed(client_socket)
finally:
t.join()
listener.close()
connector.close()
def test_server_makefile1(self):
listener = tcp_listener(backlog=1)
with Closing() as closer:
listener = closer(tcp_listener(backlog=1))
port = listener.getsockname()[1]
connector = socket.socket()
self._close_on_teardown(connector)
connector = closer(socket.socket())
def connect():
connector.connect((DEFAULT_CONNECT, port))
t = threading.Thread(target=connect)
t.start()
closer.running_task(threading.Thread(target=connect))
try:
client_socket, _addr = listener.accept()
client_socket = closer.accept(listener)
fileno = client_socket.fileno()
f = client_socket.makefile()
f = closer(client_socket.makefile())
self.assert_open(client_socket, fileno)
client_socket.close()
# Under python 2, this closes socket wrapper object but not the file descriptor;
......@@ -227,38 +207,28 @@ class TestSocket(Test):
self.assert_open(fileno)
f.close()
self.assert_closed(client_socket, fileno)
finally:
t.join()
listener.close()
connector.close()
def test_server_makefile2(self):
listener = tcp_listener(backlog=1)
with Closing() as closer:
listener = closer(tcp_listener(backlog=1))
port = listener.getsockname()[1]
connector = socket.socket()
self._close_on_teardown(connector)
connector = closer(socket.socket())
def connect():
connector.connect((DEFAULT_CONNECT, port))
t = threading.Thread(target=connect)
t.start()
closer.running_task(threading.Thread(target=connect))
client_socket = closer.accept(listener)
try:
client_socket, _addr = listener.accept()
fileno = client_socket.fileno()
f = client_socket.makefile()
f = closer(client_socket.makefile())
self.assert_open(client_socket, fileno)
# closing fileobject does not close the socket
f.close()
self.assert_open(client_socket, fileno)
client_socket.close()
self.assert_closed(client_socket, fileno)
finally:
t.join()
listener.close()
connector.close()
@greentest.skipOnAppVeyor("This sometimes times out for no apparent reason.")
......@@ -281,7 +251,6 @@ class TestSSL(Test):
# our socket first, so this fails.
pass
else:
#self._close_on_teardown(x)
x.close()
def _make_ssl_connect_task(self, connector, port):
......@@ -292,53 +261,24 @@ class TestSSL(Test):
t.accepted_event = accepted_event
return t
def __cleanup(self, task, *sockets):
# workaround for test_server_makefile1, test_server_makefile2,
# test_server_simple, test_serverssl_makefile1.
# On PyPy on Linux, it is important to join the SSL Connect
# Task FIRST, before closing the sockets. If we do it after
# (which makes more sense) we hang. It's not clear why, except
# that it has something to do with context switches. Inserting a call to
# gevent.sleep(0.1) instead of joining the task has the same
# effect. If the previous tests hang, then later tests can fail with
# SSLError: unknown alert type.
# XXX: Why do those two things happen?
# On PyPy on macOS, we don't have that problem and can use the
# more logical order.
task.join()
for s in sockets:
try:
close = s.close
except AttributeError:
continue
else:
close()
del sockets
del task
def test_simple_close(self):
s = self.make_open_socket()
with Closing() as closer:
s = closer(self.make_open_socket())
fileno = s.fileno()
s = ssl.wrap_socket(s)
self._close_on_teardown(s)
s = closer(ssl.wrap_socket(s))
fileno = s.fileno()
self.assert_open(s, fileno)
s.close()
self.assert_closed(s, fileno)
def test_makefile1(self):
raw_s = self.make_open_socket()
s = ssl.wrap_socket(raw_s)
with Closing() as closer:
raw_s = closer(self.make_open_socket())
s = closer(ssl.wrap_socket(raw_s))
self._close_on_teardown(s)
fileno = s.fileno()
self.assert_open(s, fileno)
f = s.makefile()
f = closer(s.makefile())
self.assert_open(s, fileno)
s.close()
self.assert_open(s, fileno)
......@@ -346,16 +286,15 @@ class TestSSL(Test):
raw_s.close()
self.assert_closed(s, fileno)
def test_makefile2(self):
s = self.make_open_socket()
with Closing() as closer:
s = closer(self.make_open_socket())
fileno = s.fileno()
s = ssl.wrap_socket(s)
self._close_on_teardown(s)
s = closer(ssl.wrap_socket(s))
fileno = s.fileno()
self.assert_open(s, fileno)
f = s.makefile()
f = closer(s.makefile())
self.assert_open(s, fileno)
f.close()
# closing fileobject does not close the socket
......@@ -364,44 +303,40 @@ class TestSSL(Test):
self.assert_closed(s, fileno)
def test_server_simple(self):
listener = tcp_listener(backlog=1)
with Closing() as closer:
listener = closer(tcp_listener(backlog=1))
port = listener.getsockname()[1]
connector = socket.socket()
self._close_on_teardown(connector)
connector = closer(socket.socket())
t = self._make_ssl_connect_task(connector, port)
t.start()
closer.running_task(t)
try:
client_socket, _addr = listener.accept()
client_socket = closer.accept(listener)
t.accepted_event.set()
self._close_on_teardown(client_socket.close)
client_socket = ssl.wrap_socket(client_socket, keyfile=certfile, certfile=certfile, server_side=True)
self._close_on_teardown(client_socket)
client_socket = closer(
ssl.wrap_socket(client_socket, keyfile=certfile, certfile=certfile,
server_side=True))
fileno = client_socket.fileno()
self.assert_open(client_socket, fileno)
client_socket.close()
self.assert_closed(client_socket, fileno)
finally:
self.__cleanup(t, listener, connector)
def test_server_makefile1(self):
listener = self._close_on_teardown(tcp_listener(backlog=1))
with Closing() as closer:
listener = closer(tcp_listener(backlog=1))
port = listener.getsockname()[1]
connector = socket.socket()
self._close_on_teardown(connector)
connector = closer(socket.socket())
t = self._make_ssl_connect_task(connector, port)
t.start()
closer.running_task(t)
try:
client_socket, _addr = listener.accept()
client_socket = closer.accept(listener)
t.accepted_event.set()
self._close_on_teardown(client_socket.close) # hard ref
client_socket = ssl.wrap_socket(client_socket, keyfile=certfile, certfile=certfile, server_side=True)
self._close_on_teardown(client_socket)
client_socket = closer(
ssl.wrap_socket(client_socket, keyfile=certfile, certfile=certfile,
server_side=True))
fileno = client_socket.fileno()
self.assert_open(client_socket, fileno)
f = client_socket.makefile()
......@@ -410,26 +345,22 @@ class TestSSL(Test):
self.assert_open(client_socket, fileno)
f.close()
self.assert_closed(client_socket, fileno)
finally:
self.__cleanup(t, listener, connector)
def test_server_makefile2(self):
listener = tcp_listener(backlog=1)
with Closing() as closer:
listener = closer(tcp_listener(backlog=1))
port = listener.getsockname()[1]
connector = socket.socket()
self._close_on_teardown(connector)
connector = closer(socket.socket())
t = self._make_ssl_connect_task(connector, port)
t.start()
closer.running_task(t)
try:
client_socket, _addr = listener.accept()
t.accepted_event.set()
self._close_on_teardown(client_socket)
client_socket = ssl.wrap_socket(client_socket, keyfile=certfile, certfile=certfile, server_side=True)
self._close_on_teardown(client_socket)
client_socket = closer.accept(listener)
client_socket = closer(
ssl.wrap_socket(client_socket, keyfile=certfile, certfile=certfile,
server_side=True))
fileno = client_socket.fileno()
self.assert_open(client_socket, fileno)
f = client_socket.makefile()
......@@ -439,23 +370,18 @@ class TestSSL(Test):
self.assert_open(client_socket, fileno)
client_socket.close()
self.assert_closed(client_socket, fileno)
finally:
self.__cleanup(t, connector, listener, client_socket)
def test_serverssl_makefile1(self):
listener = self._close_on_teardown(tcp_listener(backlog=1))
fileno = listener.fileno()
port = listener.getsockname()[1]
listener = ssl.wrap_socket(listener, keyfile=certfile, certfile=certfile)
raw_listener = tcp_listener(backlog=1)
fileno = raw_listener.fileno()
port = raw_listener.getsockname()[1]
listener = ssl.wrap_socket(raw_listener, keyfile=certfile, certfile=certfile)
connector = socket.socket()
self._close_on_teardown(connector)
t = self._make_ssl_connect_task(connector, port)
t.start()
try:
client_socket, _addr = listener.accept()
with CleaningUp(t, listener, raw_listener, connector) as client_socket:
t.accepted_event.set()
fileno = client_socket.fileno()
self.assert_open(client_socket, fileno)
......@@ -465,13 +391,11 @@ class TestSSL(Test):
self.assert_open(client_socket, fileno)
f.close()
self.assert_closed(client_socket, fileno)
finally:
self.__cleanup(t, listener, connector)
def test_serverssl_makefile2(self):
listener = self._close_on_teardown(tcp_listener(backlog=1))
port = listener.getsockname()[1]
listener = ssl.wrap_socket(listener, keyfile=certfile, certfile=certfile)
raw_listener = tcp_listener(backlog=1)
port = raw_listener.getsockname()[1]
listener = ssl.wrap_socket(raw_listener, keyfile=certfile, certfile=certfile)
accepted_event = threading.Event()
def connect(connector=socket.socket()):
......@@ -489,8 +413,7 @@ class TestSSL(Test):
t.daemon = True
t.start()
client_socket = None
try:
client_socket, _addr = listener.accept()
with CleaningUp(t, listener, raw_listener) as client_socket:
accepted_event.set()
fileno = client_socket.fileno()
self.assert_open(client_socket, fileno)
......@@ -505,8 +428,98 @@ class TestSSL(Test):
self.assert_open(client_socket, fileno)
client_socket.close()
self.assert_closed(client_socket, fileno)
class Closing(object):
def __init__(self, *init):
self._objects = []
for i in init:
self.closing(i)
self.task = None
def accept(self, listener):
client_socket, _addr = listener.accept()
return self.closing(client_socket)
def __enter__(self):
o = self.objects()
if len(o) == 1:
return o[0]
return self
if PY2 and CPYTHON:
# This implementation depends or refcounting
# for things to close. Eww.
def closing(self, o):
self._objects.append(weakref.ref(o))
return o
def objects(self):
return [r() for r in self._objects if r() is not None]
else:
def objects(self):
# PyPy returns an object without __len__...
return list(reversed(self._objects))
def closing(self, o):
self._objects.append(o)
return o
__call__ = closing
def running_task(self, thread):
assert self.task is None
self.task = thread
self.task.start()
return self.task
def __exit__(self, t, v, tb):
# workaround for test_server_makefile1, test_server_makefile2,
# test_server_simple, test_serverssl_makefile1.
# On PyPy on Linux, it is important to join the SSL Connect
# Task FIRST, before closing the sockets. If we do it after
# (which makes more sense) we hang. It's not clear why, except
# that it has something to do with context switches. Inserting a call to
# gevent.sleep(0.1) instead of joining the task has the same
# effect. If the previous tests hang, then later tests can fail with
# SSLError: unknown alert type.
# XXX: Why do those two things happen?
# On PyPy on macOS, we don't have that problem and can use the
# more logical order.
try:
if self.task is not None:
self.task.join()
finally:
self.task = None
for o in self.objects():
try:
o.close()
except Exception: # pylint:disable=broad-except
pass
self._objects = ()
class CleaningUp(Closing):
def __init__(self, task, listener, *other_sockets):
super(CleaningUp, self).__init__(listener, *other_sockets)
self.task = task
self.listener = listener
def __enter__(self):
return self.accept(self.listener)
def __exit__(self, t, v, tb):
try:
Closing.__exit__(self, t, v, tb)
finally:
self.__cleanup(t, listener, client_socket)
self.listener = None
if __name__ == '__main__':
......
src/gevent/tests/test__monkey_sigchld_2.py
View file @ 07891830
......@@ -16,6 +16,11 @@ def handle(*_args):
os.waitpid(-1, os.WNOHANG)
# The signal watcher must be installed *before* monkey patching
if hasattr(signal, 'SIGCHLD'):
if sys.version_info[:2] >= (3, 8) and os.environ.get("PYTHONDEVMODE"):
# See test__monkey_sigchld.py
print("Ran 1 tests in 0.0s (skipped=1)")
sys.exit(0)
# On Python 2, the signal handler breaks the platform
# module, because it uses os.popen. pkg_resources uses the platform
# module.
......
src/gevent/tests/test__monkey_sigchld_3.py
View file @ 07891830
......@@ -25,6 +25,11 @@ def _waitpid(p):
assert stat == 0, stat
if hasattr(signal, 'SIGCHLD'):
if sys.version_info[:2] >= (3, 8) and os.environ.get("PYTHONDEVMODE"):
# See test__monkey_sigchld.py
print("Ran 1 tests in 0.0s (skipped=1)")
sys.exit(0)
# Do what subprocess does and make sure we have the watcher
# in the parent
get_hub().loop.install_sigchld()
......@@ -50,3 +55,4 @@ if hasattr(signal, 'SIGCHLD'):
sys.exit(0)
else:
print("No SIGCHLD, not testing")
print("Ran 1 tests in 0.0s (skipped=1)")
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7