fixed pyright issues

Author: wolph

progressbar/multi.py

@@ -227,7 +227,8 @@ def update(force=True, write=True):  # pragma: no cover
             self._label_bar(bar_)
             bar_.update(force=force)
             if write:
-                yield bar_.fd.line
+                yield typing.cast(
+                    stream.LastLineStream, bar_.fd).line
 
         if bar_.finished():
             yield from self._render_finished_bar(bar_, now, expired, update)

progressbar/terminal/base.py

@@ -145,8 +145,8 @@ def clear_line(n):
 class _CPR(str):  # pragma: no cover
     _response_lock = threading.Lock()
 
-    def __call__(self, stream):
-        res = ''
+    def __call__(self, stream) -> tuple[int, int]:
+        res : str = ''
 
         with self._response_lock:
             stream.write(str(self))
@@ -158,14 +158,17 @@ def __call__(self, stream):
                 if char is not None:
                     res += char
 
-            res = res[2:-1].split(';')
+            res_list = res[2:-1].split(';')
 
-            res = tuple(int(item) if item.isdigit() else item for item in res)
+            res_list = tuple(int(item)
+                             if item.isdigit()
+                             else item
+                             for item in res_list)
 
-            if len(res) == 1:
-                return res[0]
+            if len(res_list) == 1:
+                return types.cast(tuple[int, int], res_list[0])
 
-            return res
+            return types.cast(tuple[int, int], tuple(res_list))
 
     def row(self, stream):
         row, _ = self(stream)
@@ -491,7 +494,7 @@ def _start_template(self):
     def _end_template(self):
         return super().__call__(self._end_code)
 
-    def __call__(self, text):
+    def __call__(self, text, *args):
         return self._start_template + text + self._end_template
 
 

progressbar/terminal/stream.py

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

progressbar/widgets.py

@@ -1470,11 +1470,11 @@ class JobStatusBar(Bar, VariableMixin):
         failure_marker: The marker to use for failed jobs.
     '''
 
-    success_fg_color: terminal.OptionalColor | None = colors.green
-    success_bg_color: terminal.OptionalColor | None = None
+    success_fg_color: terminal.Color | None = colors.green
+    success_bg_color: terminal.Color | None = None
     success_marker: str = '█'
-    failure_fg_color: terminal.OptionalColor | None = colors.red
-    failure_bg_color: terminal.OptionalColor | None = None
+    failure_fg_color: terminal.Color | None = colors.red
+    failure_bg_color: terminal.Color | None = None
     failure_marker: str = 'X'
     job_markers: list[str]
 

pyproject.toml

@@ -181,3 +181,10 @@ exclude_lines = [
     'if types.TYPE_CHECKING:',
     '@typing.overload',
 ]
+
+[tool.pyright]
+include= ['progressbar']
+exclude= ['examples']
+ignore= ['docs']
+
+reportIncompatibleMethodOverride = false