# HG changeset patch # User Matt Harbison # Date 1658263597 14400 # Node ID a77c1375c3163cda961cee07f2d7d7a3ab01cd84 # Parent cd3b8fd1d3eb7dd7c8e3707240832cd59242e8bb run-tests: drop a workaround for python2 The problem is only on python3, but the awkward handling was because python2 didn't have this exception type. I've sporadically seen it running in WSL, but no clue what it means. diff -r cd3b8fd1d3eb -r a77c1375c316 tests/run-tests.py --- a/tests/run-tests.py Tue Jan 03 23:53:44 2023 -0500 +++ b/tests/run-tests.py Tue Jul 19 16:46:37 2022 -0400 @@ -272,14 +272,11 @@ with contextlib.closing(socket.socket(family, socket.SOCK_STREAM)) as s: s.bind(('localhost', port)) return True + except PermissionError: + return False except socket.error as exc: if WINDOWS and exc.errno == errno.WSAEACCES: return False - # TODO: make a proper exception handler after dropping py2. This - # works because socket.error is an alias for OSError on py3, - # which is also the baseclass of PermissionError. - elif isinstance(exc, PermissionError): - return False if exc.errno not in ( errno.EADDRINUSE, errno.EADDRNOTAVAIL,