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

Fix crash when sys.stdin is None #7118

Merged
merged 8 commits into from
Oct 2, 2019
Merged
Show file tree
Hide file tree
Changes from 5 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/7118.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a crash when ``sys.stdin`` is set to ``None``, such as on AWS Lambda.
1 change: 1 addition & 0 deletions news/7119.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix a crash when ``sys.stdin`` is set to ``None``, such as on AWS Lambda.
7 changes: 7 additions & 0 deletions src/pip/_internal/utils/misc.py
Original file line number Diff line number Diff line change
Expand Up @@ -864,3 +864,10 @@ def protect_pip_from_modification_on_windows(modifying_pip):
'To modify pip, please run the following command:\n{}'
.format(" ".join(new_command))
)


def is_console_interactive():
# type: () -> bool
"""Is this console interactive?
"""
return sys.stdin is not None and sys.stdin.isatty()
4 changes: 2 additions & 2 deletions src/pip/_internal/vcs/subversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
import logging
import os
import re
import sys

from pip._internal.utils.logging import indent_log
from pip._internal.utils.misc import (
display_path,
rmtree,
split_auth_from_netloc,
is_console_interactive
)
from pip._internal.utils.subprocess import make_command
from pip._internal.utils.typing import MYPY_CHECK_RUNNING
Expand Down Expand Up @@ -188,7 +188,7 @@ def is_commit_id_equal(cls, dest, name):
def __init__(self, use_interactive=None):
# type: (bool) -> None
if use_interactive is None:
use_interactive = sys.stdin.isatty()
use_interactive = is_console_interactive()
self.use_interactive = use_interactive

# This member is used to cache the fetched version of the current
Expand Down
28 changes: 27 additions & 1 deletion tests/unit/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
rmtree_errorhandler,
split_auth_from_netloc,
split_auth_netloc_from_url,
)
is_console_interactive)
from pip._internal.utils.setuptools_build import make_setuptools_shim_args


Expand Down Expand Up @@ -971,3 +971,29 @@ def test_make_setuptools_shim_args__unbuffered_output(unbuffered_output):
unbuffered_output=unbuffered_output
)
assert ('-u' in args) == unbuffered_output


def mock_stdin_isatty(monkeypatch, return_value):
monkeypatch.setattr(sys.stdin, 'isatty', Mock(return_value=return_value))


def test_is_console_interactive_when_stdin_is_none_and_isatty_true(monkeypatch):
emilburzo marked this conversation as resolved.
Show resolved Hide resolved
mock_stdin_isatty(monkeypatch, True)
monkeypatch.setattr(sys, 'stdin', None)
assert is_console_interactive() is False


def test_is_console_interactive_when_stdin_is_none_and_isatty_false(monkeypatch):
mock_stdin_isatty(monkeypatch, False)
monkeypatch.setattr(sys, 'stdin', None)
assert is_console_interactive() is False


def test_is_console_interactive_when_stdin_is_not_none_and_isatty_true(monkeypatch):
mock_stdin_isatty(monkeypatch, True)
assert is_console_interactive() is True


def test_is_console_interactive_when_stdin_is_not_none_and_isatty_false(monkeypatch):
mock_stdin_isatty(monkeypatch, False)
assert is_console_interactive() is False