comparison mercurial/pycompat.py @ 49803:55d45d0de4e7

typing: add type hints to pycompat.bytestr

The problem with leaving pytype to its own devices here was that for functions
that returned a bytestr, pytype inferred `Union[bytes, int]`.  It now accepts
that it can be treated as plain bytes.

I wasn't able to figure out the arg type for `__getitem__`- `SupportsIndex`
(which PyCharm indicated is how the superclass function is typed) got flagged:

    File "/mnt/c/Users/Matt/hg/mercurial/pycompat.py", line 236, in __getitem__:
        unsupported operand type(s) for item retrieval: bytestr and SupportsIndex [unsupported-operands]
      Function __getitem__ on bytestr expects int

But some caller got flagged when I marked it as `int`.

There's some minor spillover problems elsewhere- pytype doesn't seem to
recognize that `bytes.startswith()` can optionally take a 3rd and 4th arg, so
those few places have the warning disabled.  It also flags where the tar API is
being abused, but that would be a tricky refactor (and would require typing
extensions until py3.7 is dropped), so disable those too.

49802:f3f33980f19b

import sys
import tempfile
import xmlrpc.client as xmlrpclib

from typing import (
    List,
    Optional,
)

ispy3 = sys.version_info[0] >= 3
ispypy = '__pypy__' in sys.builtin_module_names
TYPE_CHECKING = False

if not globals():  # hide this from non-pytype users
    import typing

    TYPE_CHECKING = typing.TYPE_CHECKING


def future_set_exception_info(f, exc_info):
    f.set_exception(exc_info[0])

    # since the appropriate bytes format is done internally.
    #
    # https://github.com/google/pytype/issues/500
    if TYPE_CHECKING:

        def __init__(self, s=b''):
            pass

    def __new__(cls, s=b''):
        if isinstance(s, bytestr):
            return s
        if not isinstance(
            s, (bytes, bytearray)
        ) and not builtins.hasattr(  # hasattr-py3-only
            s, u'__bytes__'
        ):
            s = str(s).encode('ascii')
        return bytes.__new__(cls, s)

    def __getitem__(self, key):
        s = bytes.__getitem__(self, key)
        if not isinstance(s, bytes):
            s = bytechr(s)
        return s

    def __iter__(self):
        return iterbytestr(bytes.__iter__(self))

    def __repr__(self):
        return bytes.__repr__(self)[1:]  # drop b''


def iterbytestr(s):
    """Iterate bytes as if it were a str object of Python 2"""
    return map(bytechr, s)


def maybebytestr(s):

49803:55d45d0de4e7

import sys
import tempfile
import xmlrpc.client as xmlrpclib

from typing import (
    Iterable,
    Iterator,
    List,
    Optional,
    Type,
    TypeVar,
)

ispy3 = sys.version_info[0] >= 3
ispypy = '__pypy__' in sys.builtin_module_names
TYPE_CHECKING = False

if not globals():  # hide this from non-pytype users
    import typing

    TYPE_CHECKING = typing.TYPE_CHECKING

_Tbytestr = TypeVar('_Tbytestr', bound='bytestr')


def future_set_exception_info(f, exc_info):
    f.set_exception(exc_info[0])

    # since the appropriate bytes format is done internally.
    #
    # https://github.com/google/pytype/issues/500
    if TYPE_CHECKING:

        def __init__(self, s: object = b'') -> None:
            pass

    def __new__(cls: Type[_Tbytestr], s: object = b'') -> _Tbytestr:
        if isinstance(s, bytestr):
            return s
        if not isinstance(
            s, (bytes, bytearray)
        ) and not builtins.hasattr(  # hasattr-py3-only
            s, u'__bytes__'
        ):
            s = str(s).encode('ascii')
        return bytes.__new__(cls, s)

    def __getitem__(self, key) -> bytes:
        s = bytes.__getitem__(self, key)
        if not isinstance(s, bytes):
            s = bytechr(s)
        return s

    def __iter__(self) -> Iterator[bytes]:
        return iterbytestr(bytes.__iter__(self))

    def __repr__(self) -> str:
        return bytes.__repr__(self)[1:]  # drop b''


def iterbytestr(s: Iterable[int]) -> Iterator[bytes]:
    """Iterate bytes as if it were a str object of Python 2"""
    return map(bytechr, s)


def maybebytestr(s):