Added python 3.7 type hinting compatibility

Author: wolph

progressbar/bar.py

@@ -133,7 +133,7 @@ class ProgressBarBase(types.Iterable, ProgressBarMixinBase):
 
 class DefaultFdMixin(ProgressBarMixinBase):
     # The file descriptor to write to. Defaults to `sys.stderr`
-    fd: types.IO = sys.stderr
+    fd: base.IO = sys.stderr
     #: Set the terminal to be ANSI compatible. If a terminal is ANSI
     #: compatible we will automatically enable `colors` and disable
     #: `line_breaks`.
@@ -146,7 +146,7 @@ class DefaultFdMixin(ProgressBarMixinBase):
 
     def __init__(
         self,
-        fd: types.IO = sys.stderr,
+        fd: base.IO = sys.stderr,
         is_terminal: bool | None = None,
         line_breaks: bool | None = None,
         enable_colors: bool | None = None,
@@ -303,10 +303,10 @@ def finish(self):  # pragma: no cover
 class StdRedirectMixin(DefaultFdMixin):
     redirect_stderr: bool = False
     redirect_stdout: bool = False
-    stdout: types.IO
-    stderr: types.IO
-    _stdout: types.IO
-    _stderr: types.IO
+    stdout: base.IO
+    stderr: base.IO
+    _stdout: base.IO
+    _stderr: base.IO
 
     def __init__(
         self,

progressbar/base.py

@@ -1,4 +1,5 @@
 # -*- mode: python; coding: utf-8 -*-
+from python_utils import types
 
 
 class FalseMeta(type):
@@ -17,3 +18,10 @@ class UnknownLength(metaclass=FalseMeta):
 
 class Undefined(metaclass=FalseMeta):
     pass
+
+
+try:
+    IO = types.IO  # type: ignore
+    TextIO = types.TextIO  # type: ignore
+except AttributeError:
+    from typing.io import IO  # type: ignore

progressbar/utils.py

@@ -15,6 +15,8 @@
 from python_utils.terminal import get_terminal_size
 from python_utils.time import epoch, format_time, timedelta_to_seconds
 
+from progressbar import base
+
 if types.TYPE_CHECKING:
     from .bar import ProgressBar, ProgressBarMixinBase
 
@@ -39,7 +41,7 @@
 
 
 def is_ansi_terminal(
-    fd: types.IO, is_terminal: bool | None = None
+    fd: base.IO, is_terminal: bool | None = None
 ) -> bool:  # pragma: no cover
     if is_terminal is None:
         # Jupyter Notebooks define this variable and support progress bars
@@ -74,7 +76,7 @@ def is_ansi_terminal(
     return bool(is_terminal)
 
 
-def is_terminal(fd: types.IO, is_terminal: bool | None = None) -> bool:
+def is_terminal(fd: base.IO, is_terminal: bool | None = None) -> bool:
     if is_terminal is None:
         # Full ansi support encompasses what we expect from a terminal
         is_terminal = is_ansi_terminal(fd) or None
@@ -188,14 +190,14 @@ def env_flag(name: str, default: bool | None = None) -> bool | None:
 
 class WrappingIO:
     buffer: io.StringIO
-    target: types.IO
+    target: base.IO
     capturing: bool
     listeners: set
     needs_clear: bool = False
 
     def __init__(
         self,
-        target: types.IO,
+        target: base.IO,
         capturing: bool = False,
         listeners: types.Set[ProgressBar] = None,
     ) -> None:
@@ -300,8 +302,8 @@ def __exit__(
 class StreamWrapper:
     '''Wrap stdout and stderr globally'''
 
-    stdout: types.TextIO | WrappingIO
-    stderr: types.TextIO | WrappingIO
+    stdout: base.TextIO | WrappingIO
+    stderr: base.TextIO | WrappingIO
     original_excepthook: types.Callable[
         [
             types.Optional[types.Type[BaseException]],
@@ -366,7 +368,7 @@ def wrap(self, stdout: bool = False, stderr: bool = False) -> None:
         if stderr:
             self.wrap_stderr()
 
-    def wrap_stdout(self) -> types.IO:
+    def wrap_stdout(self) -> base.IO:
         self.wrap_excepthook()
 
         if not self.wrapped_stdout:
@@ -377,7 +379,7 @@ def wrap_stdout(self) -> types.IO:
 
         return sys.stdout
 
-    def wrap_stderr(self) -> types.IO:
+    def wrap_stderr(self) -> base.IO:
         self.wrap_excepthook()
 
         if not self.wrapped_stderr:

progressbar/widgets.py

@@ -207,9 +207,10 @@ class WidgetBase(WidthWidgetMixin, metaclass=abc.ABCMeta):
      - max_width: Only display the widget if at most `max_width` is left
      - weight: Widgets with a higher `weigth` will be calculated before widgets
        with a lower one
-    - copy: Copy this widget when initializing the progress bar so the
-      progressbar can be reused. Some widgets such as the FormatCustomText
-      require the shared state so this needs to be optional
+     - copy: Copy this widget when initializing the progress bar so the
+       progressbar can be reused. Some widgets such as the FormatCustomText
+       require the shared state so this needs to be optional
+
     '''
 
     copy = True