diff --git a/bitarray/__init__.pyi b/bitarray/__init__.pyi index 692bba32..63335c0e 100644 --- a/bitarray/__init__.pyi +++ b/bitarray/__init__.pyi @@ -5,14 +5,14 @@ Python 3.9 and mypy 0.902 from collections.abc import Iterable, Iterator from unittest.runner import TextTestResult -from typing import Any, BinaryIO, Union, overload +from typing import Any, BinaryIO, Dict, Union, overload -Codedict = dict[Any, bitarray] +Codedict = Dict[Any, bitarray] class decodetree: - def __init__(self, code: Codedict, /) -> None: ... + def __init__(self, code: Codedict) -> None: ... def nodes(self) -> int: ... def todict(self) -> Codedict: ... @@ -20,11 +20,11 @@ class decodetree: class bitarray: def __init__(self, initializer: Union[int, str, Iterable[int], None] = ..., - endian: str = ..., /) -> None: ... + endian: str = ...) -> None: ... def all(self) -> bool: ... def any(self) -> bool: ... - def append(self, value: int, /) -> None: ... + def append(self, value: int) -> None: ... def buffer_info(self) -> tuple[int, int, str, int, int]: ... def bytereverse(self) -> None: ... def clear(self) -> None: ... @@ -32,43 +32,43 @@ class bitarray: def count(self, value: int = ..., start: int = ..., - stop: int = ..., /) -> int: ... + stop: int = ...) -> int: ... - def decode(self, code: Union[Codedict, decodetree], /) -> list: ... - def encode(self, code: Codedict, x: Iterable, /) -> None: ... + def decode(self, code: Union[Codedict, decodetree]) -> list: ... + def encode(self, code: Codedict, x: Iterable) -> None: ... def endian(self) -> str: ... - def extend(self, x: Iterable[int], /) -> None: ... + def extend(self, x: Iterable[int]) -> None: ... def fill(self) -> int: ... def find(self, a: Union[bitarray, int], start: int = ..., - stop: int = ..., /) -> int: ... + stop: int = ...) -> int: ... - def frombytes(self, a: bytes, /) -> None: ... - def fromfile(self, f: BinaryIO, n: int = ..., /) -> None: ... + def frombytes(self, a: bytes) -> None: ... + def fromfile(self, f: BinaryIO, n: int = ...) -> None: ... def index(self, a: Union[bitarray, int], start: int = ..., - stop: int = ..., /) -> int: ... + stop: int = ...) -> int: ... - def insert(self, i: int, value: int, /) -> None: ... + def insert(self, i: int, value: int) -> None: ... def invert(self, i: int = ...) -> None: ... def iterdecode(self, - code: Union[Codedict, decodetree], /) -> Iterator: ... + code: Union[Codedict, decodetree]) -> Iterator: ... - def itersearch(self, a: Union[bitarray, int], /) -> Iterator[int]: ... - def pack(self, b: bytes, /) -> None: ... - def pop(self, i: int = ..., /) -> int: ... - def remove(self, value: int, /) -> None: ... + def itersearch(self, a: Union[bitarray, int]) -> Iterator[int]: ... + def pack(self, b: bytes) -> None: ... + def pop(self, i: int = ...) -> int: ... + def remove(self, value: int) -> None: ... def reverse(self) -> None: ... def search(self, a: Union[bitarray, int], limit: int = ...) -> list[int]: ... - def setall(self, value: int, /) -> None: ... + def setall(self, value: int) -> None: ... def sort(self, reverse: int) -> None: ... def to01(self) -> str: ... def tobytes(self) -> bytes: ... - def tofile(self, f: BinaryIO, /) -> None: ... + def tofile(self, f: BinaryIO) -> None: ... def tolist(self) -> list[int]: ... def unpack(self, zero: bytes = ..., @@ -115,7 +115,7 @@ class frozenbitarray(bitarray): __version__: str -def bits2bytes(n: int, /) -> int: ... +def bits2bytes(n: int) -> int: ... def get_default_endian() -> str: ... def test(verbosity: int = ..., repeat: int = ...) -> TextTestResult: ... def _set_default_endian(endian: str) -> None: ... diff --git a/bitarray/util.pyi b/bitarray/util.pyi index bbf28310..0474d5aa 100644 --- a/bitarray/util.pyi +++ b/bitarray/util.pyi @@ -14,30 +14,27 @@ def make_endian(a: bitarray, endian: str) -> bitarray: ... def rindex(a: bitarray, Value: int) -> int: ... def strip(a: bitarray, mode: str = ...) -> bitarray: ... -def count_n(a: bitarray, n: int, /) -> int: ... -def parity(a: bitarray, /) -> int: ... -def count_and(a: bitarray, b: bitarray, /) -> int: ... -def count_or(a: bitarray, b: bitarray, /) -> int: ... -def count_xor(a: bitarray, b: bitarray, /) -> int: ... -def subset(a: bitarray, b: bitarray, /) -> bool: ... - -def ba2hex(a: bitarray, /) -> str: ... -def hex2ba(s: AnyStr, /, - endian: Optional[str] = ...) -> bitarray: ... - -def ba2base(n: int, a: bitarray, /) -> str: ... +def count_n(a: bitarray, n: int) -> int: ... +def parity(a: bitarray) -> int: ... +def count_and(a: bitarray, b: bitarray) -> int: ... +def count_or(a: bitarray, b: bitarray) -> int: ... +def count_xor(a: bitarray, b: bitarray) -> int: ... +def subset(a: bitarray, b: bitarray) -> bool: ... + +def ba2hex(a: bitarray) -> str: ... +def hex2ba(s: AnyStr, endian: Optional[str] = ...) -> bitarray: ... +def ba2base(n: int, a: bitarray) -> str: ... def base2ba(n: int, - s: AnyStr, /, + s: AnyStr, endian: Optional[str] = ...) -> bitarray: ... def ba2int(a: bitarray, signed: int = ...) -> int: ... -def int2ba(i: int, /, +def int2ba(i: int, length: int = ..., endian: str = ..., signed: int = ...) -> bitarray: ... -def serialize(a: bitarray, /) -> bytes: ... -def deserialize(b: bytes, /) -> bitarray: ... +def serialize(a: bitarray) -> bytes: ... +def deserialize(b: bytes) -> bitarray: ... def huffman_code(freq_map: dict[Any, Union[int, float]], - endian: Optional[str] = ... - ) -> dict[Any, bitarray]: ... + endian: Optional[str] = ...) -> dict[Any, bitarray]: ... diff --git a/examples/ndarray.py b/examples/ndarray.py index 800ec92e..2fe18f0a 100644 --- a/examples/ndarray.py +++ b/examples/ndarray.py @@ -5,7 +5,7 @@ from __future__ import print_function import bitarray -import numpy +import numpy # type: ignore a = bitarray.bitarray('100011001001') print(a)