Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removing type ignore comments from cli package #7932

Merged
merged 1 commit into from
May 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/770AC380-E84F-44C7-A20C-CD31A829EDA5.trivial
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove "type: ignore" comments from cli subpackage
17 changes: 9 additions & 8 deletions src/pip/_internal/cli/progress_bars.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -183,6 +185,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,
Expand All @@ -206,30 +209,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

Expand All @@ -240,7 +240,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)
Expand Down