comparison mercurial/lock.py @ 51303:81224afd938d

lock: properly convert error to bytes

Flagged by pytype when a later changeset is applied moving typing comment to annotation.

We fix this ahead of the annotation change to make sure pytype remains happy
after the change.

We have to do fairly crazy dance for pytype to be happy. This probably comes
from the fact IOError.filename probably claims to be `str` while it is actually
`bytes` if the filename raising that `IOError` is bytes.

At the same time, `IOError.strerror` is consistently `str` and should be passed
as `str` everywhere.

51302:9d3721552b6c

import errno
import os
import signal
import socket
import time
import warnings

from .i18n import _

from . import (

            if delay == debugidx:
                printwarning(ui.debug, inst.locker)
            if delay == warningidx:
                printwarning(ui.warn, inst.locker)
            if timeout <= delay:
                raise error.LockHeld(
                    errno.ETIMEDOUT, inst.filename, l.desc, inst.locker
                )
            time.sleep(1)
            delay += 1

    l.delay = delay

                            self.vfs.join(self.f),
                            self.desc,
                            locker,
                        )
                else:
                    raise error.LockUnavailable(
                        why.errno, why.strerror, why.filename, self.desc
                    )

        if not self.held:
            # use empty locker to mean "busy for frequent lock/unlock
            # by many processes"

51303:81224afd938d

import errno
import os
import signal
import socket
import time
import typing
import warnings

from .i18n import _

from . import (

            if delay == debugidx:
                printwarning(ui.debug, inst.locker)
            if delay == warningidx:
                printwarning(ui.warn, inst.locker)
            if timeout <= delay:
                assert isinstance(inst.filename, bytes)
                raise error.LockHeld(
                    errno.ETIMEDOUT,
                    typing.cast(bytes, inst.filename),
                    l.desc,
                    inst.locker,
                )
            time.sleep(1)
            delay += 1

    l.delay = delay

                            self.vfs.join(self.f),
                            self.desc,
                            locker,
                        )
                else:
                    assert isinstance(why.filename, bytes)
                    assert isinstance(why.strerror, str)
                    raise error.LockUnavailable(
                        why.errno,
                        why.strerror,
                        typing.cast(bytes, why.filename),
                        self.desc,
                    )

        if not self.held:
            # use empty locker to mean "busy for frequent lock/unlock
            # by many processes"