All type issues finally fixed? Maybe?

wolph · wolph · commit 3cb06e5e7b04 · 2022-11-01T16:23:10.000+01:00
diff --git a/progressbar/bar.py b/progressbar/bar.py
@@ -51,10 +51,10 @@ class ProgressBarMixinBase(abc.ABC):
     #: are configured
     widget_kwargs: types.Dict[str, types.Any]
     #: Custom length function for multibyte characters such as CJK
-    # custom_len: types.Callable[[str], int]
-    custom_len: types.ClassVar[
-        types.Callable[['ProgressBarMixinBase', str], int]
-    ]
+    # mypy and pyright can't agree on what the correct one is... so we'll
+    # need to use a helper function :(
+    # custom_len: types.Callable[['ProgressBarMixinBase', str], int]
+    custom_len: types.Callable[[str], int]
     #: The time the progress bar was started
     initial_start_time: types.Optional[datetime]
     #: The interval to poll for updates in seconds if there are updates
@@ -188,7 +188,7 @@ def __init__(
     def update(self, *args, **kwargs):
         ProgressBarMixinBase.update(self, *args, **kwargs)
 
-        line = converters.to_unicode(self._format_line())
+        line: str = converters.to_unicode(self._format_line())
         if not self.enable_colors:
             line = utils.no_color(line)
 
@@ -240,11 +240,11 @@ def _format_widgets(self):
                 expanding.insert(0, index)
             elif isinstance(widget, str):
                 result.append(widget)
-                width -= self.custom_len(widget)
+                width -= self.custom_len(widget)  # type: ignore
             else:
                 widget_output = converters.to_unicode(widget(self, data))
                 result.append(widget_output)
-                width -= self.custom_len(widget_output)
+                width -= self.custom_len(widget_output)  # type: ignore
 
         count = len(expanding)
         while expanding:
@@ -254,7 +254,7 @@ def _format_widgets(self):
             count -= 1
 
             widget_output = widget(self, data, portion)
-            width -= self.custom_len(widget_output)
+            width -= self.custom_len(widget_output)  # type: ignore
             result[index] = widget_output
 
         return result
@@ -303,8 +303,8 @@ def finish(self):  # pragma: no cover
 class StdRedirectMixin(DefaultFdMixin):
     redirect_stderr: bool = False
     redirect_stdout: bool = False
-    stdout: base.IO
-    stderr: base.IO
+    stdout: utils.WrappingIO | base.IO
+    stderr: utils.WrappingIO | base.IO
     _stdout: base.IO
     _stderr: base.IO
 
@@ -428,7 +428,7 @@ class ProgressBar(
     you from changing the ProgressBar you should treat it as read only.
     '''
 
-    _iterable: types.Optional[types.Iterable]
+    _iterable: types.Optional[types.Iterator]
 
     _DEFAULT_MAXVAL: Type[base.UnknownLength] = base.UnknownLength
     # update every 50 milliseconds (up to a 20 times per second)
@@ -439,11 +439,11 @@ def __init__(
         self,
         min_value: T = 0,
         max_value: T | types.Type[base.UnknownLength] | None = None,
-        widgets: types.List[widgets_module.WidgetBase] = None,
+        widgets: types.Optional[types.List[widgets_module.WidgetBase]] = None,
         left_justify: bool = True,
         initial_value: T = 0,
         poll_interval: types.Optional[float] = None,
-        widget_kwargs: types.Dict[str, types.Any] = None,
+        widget_kwargs: types.Optional[types.Dict[str, types.Any]] = None,
         custom_len: types.Callable[[str], int] = utils.len_color,
         max_error=True,
         prefix=None,
@@ -594,7 +594,7 @@ def percentage(self):
             return None
         elif self.max_value:
             todo = self.value - self.min_value
-            total = self.max_value - self.min_value
+            total = self.max_value - self.min_value  # type: ignore
             percentage = 100.0 * todo / total
         else:
             percentage = 100.0
@@ -631,7 +631,7 @@ def data(self) -> types.Dict[str, types.Any]:
         '''
         self._last_update_time = time.time()
         self._last_update_timer = timeit.default_timer()
-        elapsed = self.last_update_time - self.start_time
+        elapsed = self.last_update_time - self.start_time  # type: ignore
         # For Python 2.7 and higher we have _`timedelta.total_seconds`, but we
         # want to support older versions as well
         total_seconds_elapsed = utils.deltas_to_seconds(elapsed)
@@ -717,11 +717,16 @@ def __iter__(self):
 
     def __next__(self):
         try:
-            value = next(self._iterable)
+            if self._iterable is None:  # pragma: no cover
+                value = self.value
+            else:
+                value = next(self._iterable)
+
             if self.start_time is None:
                 self.start()
             else:
                 self.update(self.value + 1)
+
             return value
         except StopIteration:
             self.finish()
diff --git a/progressbar/base.py b/progressbar/base.py
@@ -20,7 +20,7 @@ class Undefined(metaclass=FalseMeta):
     pass
 
 
-try:
+try:  # pragma: no cover
     IO = types.IO  # type: ignore
     TextIO = types.TextIO  # type: ignore
 except AttributeError:
diff --git a/progressbar/utils.py b/progressbar/utils.py
@@ -26,6 +26,8 @@
 assert scale_1024
 assert epoch
 
+StringT = types.TypeVar('StringT', bound=types.StringTypes)
+
 ANSI_TERMS = (
     '([xe]|bv)term',
     '(sco)?ansi',
@@ -141,7 +143,7 @@ def deltas_to_seconds(
         return default  # type: ignore
 
 
-def no_color(value: types.StringTypes) -> types.StringTypes:
+def no_color(value: StringT) -> StringT:
     '''
     Return the `value` without ANSI escape codes
 
@@ -153,9 +155,10 @@ def no_color(value: types.StringTypes) -> types.StringTypes:
     'abc'
     '''
     if isinstance(value, bytes):
-        return re.sub('\\\u001b\\[.*?[@-~]'.encode(), b'', value)
+        pattern: bytes = '\\\u001b\\[.*?[@-~]'.encode()
+        return re.sub(pattern, b'', value)  # type: ignore
     else:
-        return re.sub(u'\x1b\\[.*?[@-~]', '', value)
+        return re.sub(u'\x1b\\[.*?[@-~]', '', value)  # type: ignore
 
 
 def len_color(value: types.StringTypes) -> int:
@@ -199,7 +202,7 @@ def __init__(
         self,
         target: base.IO,
         capturing: bool = False,
-        listeners: types.Set[ProgressBar] = None,
+        listeners: types.Optional[types.Set[ProgressBar]] = None,
     ) -> None:
         self.buffer = io.StringIO()
         self.target = target
@@ -306,12 +309,17 @@ class StreamWrapper:
     stderr: base.TextIO | WrappingIO
     original_excepthook: types.Callable[
         [
-            types.Optional[types.Type[BaseException]],
-            types.Optional[BaseException],
-            types.Optional[TracebackType],
+            types.Type[BaseException],
+            BaseException,
+            TracebackType | None,
         ],
         None,
     ]
+    # original_excepthook: types.Callable[
+    #                          [
+    #                              types.Type[BaseException],
+    #                              BaseException, TracebackType | None,
+    #                          ], None] | None
     wrapped_stdout: int = 0
     wrapped_stderr: int = 0
     wrapped_excepthook: int = 0
@@ -368,7 +376,7 @@ def wrap(self, stdout: bool = False, stderr: bool = False) -> None:
         if stderr:
             self.wrap_stderr()
 
-    def wrap_stdout(self) -> base.IO:
+    def wrap_stdout(self) -> WrappingIO:
         self.wrap_excepthook()
 
         if not self.wrapped_stdout:
@@ -377,9 +385,9 @@ def wrap_stdout(self) -> base.IO:
             )
         self.wrapped_stdout += 1
 
-        return sys.stdout
+        return sys.stdout  # type: ignore
 
-    def wrap_stderr(self) -> base.IO:
+    def wrap_stderr(self) -> WrappingIO:
         self.wrap_excepthook()
 
         if not self.wrapped_stderr:
@@ -388,7 +396,7 @@ def wrap_stderr(self) -> base.IO:
             )
         self.wrapped_stderr += 1
 
-        return sys.stderr
+        return sys.stderr  # type: ignore
 
     def unwrap_excepthook(self) -> None:
         if self.wrapped_excepthook:
diff --git a/progressbar/widgets.py b/progressbar/widgets.py
@@ -132,7 +132,7 @@ def __call__(
         progress: ProgressBarMixinBase,
         data: Data,
         format: types.Optional[str] = None,
-    ):
+    ) -> str:
         '''Formats the widget into a string'''
         format = self.get_format(progress, data, format)
         try:
@@ -216,7 +216,7 @@ class WidgetBase(WidthWidgetMixin, metaclass=abc.ABCMeta):
     copy = True
 
     @abc.abstractmethod
-    def __call__(self, progress: ProgressBarMixinBase, data: Data):
+    def __call__(self, progress: ProgressBarMixinBase, data: Data) -> str:
         '''Updates the widget.
 
         progress - a reference to the calling ProgressBar
@@ -237,7 +237,7 @@ def __call__(
         progress: ProgressBarMixinBase,
         data: Data,
         width: int = 0,
-    ):
+    ) -> str:
         '''Updates the widget providing the total width the widget must fill.
 
         progress - a reference to the calling ProgressBar
@@ -702,7 +702,9 @@ def __call__(self, progress: ProgressBarMixinBase, data: Data, width=None):
         if self.fill:
             # Cut the last character so we can replace it with our marker
             fill = self.fill(
-                progress, data, width - progress.custom_len(marker)
+                progress,
+                data,
+                width - progress.custom_len(marker),  # type: ignore
             )
         else:
             fill = ''
@@ -767,7 +769,8 @@ class SimpleProgress(FormatWidgetMixin, WidgetBase):
     def __init__(self, format=DEFAULT_FORMAT, **kwargs):
         FormatWidgetMixin.__init__(self, format=format, **kwargs)
         WidgetBase.__init__(self, format=format, **kwargs)
-        self.max_width_cache = dict(default=self.max_width)
+        self.max_width_cache = dict()
+        self.max_width_cache['default'] = self.max_width or 0
 
     def __call__(
         self, progress: ProgressBarMixinBase, data: Data, format=None
@@ -950,7 +953,7 @@ class FormatCustomText(FormatWidgetMixin, WidgetBase):
     def __init__(
         self,
         format: str,
-        mapping: types.Dict[str, types.Any] = None,
+        mapping: types.Optional[types.Dict[str, types.Any]] = None,
         **kwargs,
     ):
         self.format = format
