comparison tests/run-tests.py @ 47233:bcafcd779d2e

branching: merge stable into default

47232:33096e77598c

            s.bind(('localhost', port))
        return True
    except socket.error as exc:
        if os.name == 'nt' and exc.errno == errno.WSAEACCES:
            return False
        elif exc.errno not in (
            errno.EADDRINUSE,
            errno.EADDRNOTAVAIL,
            errno.EPROTONOSUPPORT,
        ):
            raise

            continue

        for line in f.readlines():
            line = line.split(b'#', 1)[0].strip()
            if line:
                entries[line] = filename

        f.close()
    return entries

47233:bcafcd779d2e

            s.bind(('localhost', port))
        return True
    except socket.error as exc:
        if os.name == 'nt' 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,
        ):
            raise

            continue

        for line in f.readlines():
            line = line.split(b'#', 1)[0].strip()
            if line:
                # Ensure path entries are compatible with os.path.relpath()
                entries[os.path.normpath(line)] = filename

        f.close()
    return entries