| Alphare |
| hg-reviewers |
PYTHON3 is always True now so this logic should be identical as to before.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/run-tests.py (11 lines) |
| family = socket.AF_INET | family = socket.AF_INET | ||||
| try: | try: | ||||
| with contextlib.closing(socket.socket(family, socket.SOCK_STREAM)) as s: | with contextlib.closing(socket.socket(family, socket.SOCK_STREAM)) as s: | ||||
| s.bind(('localhost', port)) | s.bind(('localhost', port)) | ||||
| return True | return True | ||||
| except socket.error as exc: | except socket.error as exc: | ||||
| if WINDOWS and exc.errno == errno.WSAEACCES: | if WINDOWS and exc.errno == errno.WSAEACCES: | ||||
| return False | return False | ||||
| elif PYTHON3: | |||||
| # TODO: make a proper exception handler after dropping py2. This | # TODO: make a proper exception handler after dropping py2. This | ||||
| # works because socket.error is an alias for OSError on py3, | # works because socket.error is an alias for OSError on py3, | ||||
| # which is also the baseclass of PermissionError. | # which is also the baseclass of PermissionError. | ||||
| if isinstance(exc, PermissionError): | elif isinstance(exc, PermissionError): | ||||
| return False | return False | ||||
| if exc.errno not in ( | if exc.errno not in ( | ||||
| errno.EADDRINUSE, | errno.EADDRINUSE, | ||||
| errno.EADDRNOTAVAIL, | errno.EADDRNOTAVAIL, | ||||
| errno.EPROTONOSUPPORT, | errno.EPROTONOSUPPORT, | ||||
| ): | ): | ||||
| raise | raise | ||||
| return False | return False | ||||