comparison tests/run-tests.py @ 48858:9d01ab54df3f

tests: collapse elif PYTHON3 block

PYTHON3 is always True now so this logic should be identical as to before.

Differential Revision: https://phab.mercurial-scm.org/D12236

48857:41c552a20716

            s.bind(('localhost', port))
        return True
    except socket.error as exc:
        if WINDOWS and exc.errno == errno.WSAEACCES:
            return False
        elif PYTHON3:
            # 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.
            if isinstance(exc, PermissionError):
                return False
        if exc.errno not in (
            errno.EADDRINUSE,
            errno.EADDRNOTAVAIL,
            errno.EPROTONOSUPPORT,
        ):

48858:9d01ab54df3f

            s.bind(('localhost', port))
        return True
    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,
            errno.EPROTONOSUPPORT,
        ):