Removing type ignore comments from cli package

pypa · Apr 10, 2020 · e482c74 · e482c74
1 parent 720c77a
commit e482c74
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/news/770AC380-E84F-44C7-A20C-CD31A829EDA5.trivial b/news/770AC380-E84F-44C7-A20C-CD31A829EDA5.trivial
@@ -0,0 +1 @@
+Remove "type: ignore" comments from cli subpackage
diff --git a/src/pip/_internal/cli/progress_bars.py b/src/pip/_internal/cli/progress_bars.py
@@ -78,6 +78,7 @@ def __init__(self, *args, **kwargs):
         """
         Save the original SIGINT handler for later.
         """
+        # https://github.com/python/mypy/issues/5887
         super(InterruptibleMixin, self).__init__(  # type: ignore
             *args,
             **kwargs
@@ -134,6 +135,7 @@ class DownloadProgressMixin(object):
 
     def __init__(self, *args, **kwargs):
         # type: (List[Any], Dict[Any, Any]) -> None
+        # https://github.com/python/mypy/issues/5887
         super(DownloadProgressMixin, self).__init__(  # type: ignore
             *args,
             **kwargs
@@ -145,11 +147,13 @@ def __init__(self, *args, **kwargs):
     @property
     def downloaded(self):
         # type: () -> str
+
         return format_size(self.index)  # type: ignore
 
     @property
     def download_speed(self):
         # type: () -> str
+
         # Avoid zero division errors...
         if self.avg == 0.0:  # type: ignore
             return "..."
@@ -158,11 +162,13 @@ def download_speed(self):
     @property
     def pretty_eta(self):
         # type: () -> str
+
         if self.eta:  # type: ignore
             return "eta {}".format(self.eta_td)  # type: ignore
         return ""
 
     def iter(self, it):  # type: ignore
+
         for x in it:
             yield x
             self.next(len(x))
@@ -183,6 +189,7 @@ def __init__(self, *args, **kwargs):
         if WINDOWS and self.hide_cursor:  # type: ignore
             self.hide_cursor = False
 
+        # https://github.com/python/mypy/issues/5887
         super(WindowsMixin, self).__init__(*args, **kwargs)  # type: ignore
 
         # Check if we are running on Windows and we have the colorama module,
@@ -206,30 +213,27 @@ class BaseDownloadProgressBar(WindowsMixin, InterruptibleMixin,
     message = "%(percent)d%%"
     suffix = "%(downloaded)s %(download_speed)s %(pretty_eta)s"
 
-# NOTE: The "type: ignore" comments on the following classes are there to
-#       work around https://github.com/python/typing/issues/241
-
 
 class DefaultDownloadProgressBar(BaseDownloadProgressBar,
                                  _BaseBar):
     pass
 
 
-class DownloadSilentBar(BaseDownloadProgressBar, SilentBar):  # type: ignore
+class DownloadSilentBar(BaseDownloadProgressBar, SilentBar):
     pass
 
 
-class DownloadBar(BaseDownloadProgressBar,  # type: ignore
+class DownloadBar(BaseDownloadProgressBar,
                   Bar):
     pass
 
 
-class DownloadFillingCirclesBar(BaseDownloadProgressBar,  # type: ignore
+class DownloadFillingCirclesBar(BaseDownloadProgressBar,
                                 FillingCirclesBar):
     pass
 
 
-class DownloadBlueEmojiProgressBar(BaseDownloadProgressBar,  # type: ignore
+class DownloadBlueEmojiProgressBar(BaseDownloadProgressBar,
                                    BlueEmojiBar):
     pass
 
@@ -240,7 +244,8 @@ class DownloadProgressSpinner(WindowsMixin, InterruptibleMixin,
     file = sys.stdout
     suffix = "%(downloaded)s %(download_speed)s"
 
-    def next_phase(self):  # type: ignore
+    def next_phase(self):
+        # type: () -> str
         if not hasattr(self, "_phaser"):
             self._phaser = itertools.cycle(self.phases)
         return next(self._phaser)