Fixed basic tox/pytest runs

Author: wolph

progressbar/bar.py

@@ -34,6 +34,7 @@
 
 T = types.TypeVar('T')
 
+
 class ProgressBarMixinBase(abc.ABC):
     _started = False
     _finished = False
@@ -184,7 +185,7 @@ class DefaultFdMixin(ProgressBarMixinBase):
 
     def __init__(
         self,
-        fd: base.IO[str] = sys.stderr,
+        fd: base.TextIO = sys.stderr,
         is_terminal: bool | None = None,
         line_breaks: bool | None = None,
         enable_colors: progressbar.env.ColorSupport | None = None,
@@ -205,11 +206,12 @@ def __init__(
 
         super().__init__(**kwargs)
 
-    def _apply_line_offset(self, fd: base.IO[T], line_offset: int) -> base.IO[T]:
+    def _apply_line_offset(
+        self, fd: base.TextIO, line_offset: int
+    ) -> base.TextIO:
         if line_offset:
             return progressbar.terminal.stream.LineOffsetStreamWrapper(
-                line_offset,
-                types.cast(base.TextIO, fd),
+                line_offset, fd,
             )
         else:
             return fd
@@ -280,7 +282,7 @@ def update(self, *args: types.Any, **kwargs: types.Any) -> None:
         try:  # pragma: no cover
             self.fd.write(line)
         except UnicodeEncodeError:  # pragma: no cover
-            self.fd.write(line.encode('ascii', 'replace'))
+            self.fd.write(types.cast(str, line.encode('ascii', 'replace')))
 
     def finish(
         self,
@@ -921,7 +923,7 @@ def _update_parents(self, value):
         # Only flush if something was actually written
         self.fd.flush()
 
-    def start(self, max_value=None, init=True):
+    def start(self, max_value=None, init=True, *args, **kwargs):
         '''Starts measuring time, and prints the bar at 0%.
 
         It returns self so you can use it like this:
@@ -952,9 +954,9 @@ def start(self, max_value=None, init=True):
         if self.max_value is None:
             self.max_value = self._DEFAULT_MAXVAL
 
-        StdRedirectMixin.start(self, max_value=max_value)
-        ResizableMixin.start(self, max_value=max_value)
-        ProgressBarBase.start(self, max_value=max_value)
+        StdRedirectMixin.start(self, max_value=max_value, *args, **kwargs)
+        ResizableMixin.start(self, max_value=max_value, *args, **kwargs)
+        ProgressBarBase.start(self, max_value=max_value, *args, **kwargs)
 
         # Constructing the default widgets is only done when we know max_value
         if not self.widgets:

progressbar/multi.py

@@ -75,22 +75,22 @@ class MultiBar(typing.Dict[str, bar.ProgressBar]):
     _thread_closed: threading.Event = threading.Event()
 
     def __init__(
-            self,
-            bars: typing.Iterable[tuple[str, bar.ProgressBar]] | None = None,
-            fd: typing.TextIO = sys.stderr,
-            prepend_label: bool = True,
-            append_label: bool = False,
-            label_format='{label:20.20} ',
-            initial_format: str | None = '{label:20.20} Not yet started',
-            finished_format: str | None = None,
-            update_interval: float = 1 / 60.0,  # 60fps
-            show_initial: bool = True,
-            show_finished: bool = True,
-            remove_finished: timedelta | float = timedelta(seconds=3600),
-            sort_key: str | SortKey = SortKey.CREATED,
-            sort_reverse: bool = True,
-            sort_keyfunc: SortKeyFunc | None = None,
-            **progressbar_kwargs,
+        self,
+        bars: typing.Iterable[tuple[str, bar.ProgressBar]] | None = None,
+        fd: typing.TextIO = sys.stderr,
+        prepend_label: bool = True,
+        append_label: bool = False,
+        label_format='{label:20.20} ',
+        initial_format: str | None = '{label:20.20} Not yet started',
+        finished_format: str | None = None,
+        update_interval: float = 1 / 60.0,  # 60fps
+        show_initial: bool = True,
+        show_finished: bool = True,
+        remove_finished: timedelta | float = timedelta(seconds=3600),
+        sort_key: str | SortKey = SortKey.CREATED,
+        sort_reverse: bool = True,
+        sort_keyfunc: SortKeyFunc | None = None,
+        **progressbar_kwargs,
     ):
         self.fd = fd
 
@@ -197,11 +197,11 @@ def render(self, flush: bool = True, force: bool = False):
                 self._buffer.write('\n')
 
             for i, (previous, current) in enumerate(
-                    itertools.zip_longest(
-                        self._previous_output,
-                        output,
-                        fillvalue='',
-                    ),
+                itertools.zip_longest(
+                    self._previous_output,
+                    output,
+                    fillvalue='',
+                ),
             ):
                 if previous != current or force:  # pragma: no branch
                     self.print(
@@ -218,10 +218,10 @@ def render(self, flush: bool = True, force: bool = False):
                 self.flush()
 
     def _render_bar(
-            self,
-            bar_: bar.ProgressBar,
-            now,
-            expired,
+        self,
+        bar_: bar.ProgressBar,
+        now,
+        expired,
     ) -> typing.Iterable[str]:
         def update(force=True, write=True):  # pragma: no cover
             self._label_bar(bar_)
@@ -242,21 +242,21 @@ def update(force=True, write=True):  # pragma: no cover
                 yield self.initial_format.format(label=bar_.label)
 
     def _render_finished_bar(
-            self,
-            bar_: bar.ProgressBar,
-            now,
-            expired,
-            update,
+        self,
+        bar_: bar.ProgressBar,
+        now,
+        expired,
+        update,
     ) -> typing.Iterable[str]:
         if bar_ not in self._finished_at:
             self._finished_at[bar_] = now
             # Force update to get the finished format
             update(write=False)
 
         if (
-                self.remove_finished
-                and expired is not None
-                and expired >= self._finished_at[bar_]
+            self.remove_finished
+            and expired is not None
+            and expired >= self._finished_at[bar_]
         ):
             del self[bar_.label]
             return
@@ -271,13 +271,13 @@ def _render_finished_bar(
                 yield self.finished_format.format(label=bar_.label)
 
     def print(
-            self,
-            *args,
-            end='\n',
-            offset=None,
-            flush=True,
-            clear=True,
-            **kwargs,
+        self,
+        *args,
+        end='\n',
+        offset=None,
+        flush=True,
+        clear=True,
+        **kwargs,
     ):
         '''
         Print to the progressbar stream without overwriting the progressbars.

progressbar/terminal/stream.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import sys
+import typing
 from types import TracebackType
 from typing import Iterable, Iterator
 
@@ -23,16 +24,16 @@ def flush(self) -> None:
     def isatty(self) -> bool:
         return self.stream.isatty()
 
-    def read(self, __n: int = -1) -> str:
+    def read(self, __n: int = -1) -> typing.AnyStr:
         return self.stream.read(__n)
 
     def readable(self) -> bool:
         return self.stream.readable()
 
-    def readline(self, __limit: int = -1) -> str:
+    def readline(self, __limit: int = -1) -> typing.AnyStr:
         return self.stream.readline(__limit)
 
-    def readlines(self, __hint: int = -1) -> list[str]:
+    def readlines(self, __hint: int = -1) -> list[typing.AnyStr]:
         return self.stream.readlines(__hint)
 
     def seek(self, __offset: int, __whence: int = 0) -> int:
@@ -50,13 +51,13 @@ def truncate(self, __size: int | None = None) -> int:
     def writable(self) -> bool:
         return self.stream.writable()
 
-    def writelines(self, __lines: Iterable[str]) -> None:
+    def writelines(self, __lines: Iterable[typing.AnyStr]) -> None:
         return self.stream.writelines(__lines)
 
-    def __next__(self) -> str:
+    def __next__(self) -> typing.AnyStr:
         return self.stream.__next__()
 
-    def __iter__(self) -> Iterator[str]:
+    def __iter__(self) -> Iterator[typing.AnyStr]:
         return self.stream.__iter__()
 
     def __exit__(
@@ -93,28 +94,29 @@ def write(self, data):
 
 
 class LastLineStream(TextIOOutputWrapper):
-    line: str = ''
+    line: typing.AnyStr = ''
 
     def seekable(self) -> bool:
         return False
 
     def readable(self) -> bool:
         return True
 
-    def read(self, __n: int = -1) -> str:
+    def read(self, __n: int = -1) -> typing.AnyStr:
         if __n < 0:
             return self.line
         else:
             return self.line[:__n]
 
-    def readline(self, __limit: int = -1) -> str:
+    def readline(self, __limit: int = -1) -> typing.AnyStr:
         if __limit < 0:
             return self.line
         else:
             return self.line[:__limit]
 
-    def write(self, data):
+    def write(self, data: typing.AnyStr) -> int:
         self.line = data
+        return len(data)
 
     def truncate(self, __size: int | None = None) -> int:
         if __size is None:
@@ -124,10 +126,11 @@ def truncate(self, __size: int | None = None) -> int:
 
         return len(self.line)
 
-    def __iter__(self) -> Iterator[str]:
+    def __iter__(self) -> typing.Generator[typing.AnyStr, typing.Any,
+                                           typing.Any]:
         yield self.line
 
-    def writelines(self, __lines: Iterable[str]) -> None:
+    def writelines(self, __lines: Iterable[typing.AnyStr]) -> None:
         line = ''
         # Walk through the lines and take the last one
         for line in __lines:  # noqa: B007