Skip to content

Clean up terminal width handling #9143

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jul 22, 2020
Merged

Clean up terminal width handling #9143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ae1be7
Remove fixed_terminal_width from utils.colorize docstring
The-Compiler Jul 13, 2020
310bb18
Move MYPY_FORCE_TERMINAL_WIDTH handling into get_terminal_width()
The-Compiler Jul 13, 2020
6589d82
Use shutil.get_terminal_size()
The-Compiler Jul 13, 2020
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
3 changes: 1 addition & 2 deletions mypy/dmypy/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,8 +475,7 @@ def request(status_file: str, command: str, *, timeout: Optional[int] = None,
# Tell the server whether this request was initiated from a human-facing terminal,
# so that it can format the type checking output accordingly.
args['is_tty'] = sys.stdout.isatty() or int(os.getenv('MYPY_FORCE_COLOR', '0')) > 0
args['terminal_width'] = (int(os.getenv('MYPY_FORCE_TERMINAL_WIDTH', '0')) or
get_terminal_width())
args['terminal_width'] = get_terminal_width()
bdata = json.dumps(args).encode('utf8')
_, name = get_status(status_file)
try:
Expand Down
20 changes: 4 additions & 16 deletions mypy/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import sys
import hashlib
import io
import shutil

from typing import (
TypeVar, List, Tuple, Optional, Dict, Sequence, Iterable, Container, IO, Callable
Expand Down Expand Up @@ -34,7 +35,6 @@
PLAIN_ANSI_DIM = '\x1b[2m' # type: Final

DEFAULT_SOURCE_OFFSET = 4 # type: Final
DEFAULT_COLUMNS = 80 # type: Final

# At least this number of columns will be shown on each side of
# error location when printing source code snippet.
Expand Down Expand Up @@ -424,14 +424,7 @@ def split_words(msg: str) -> List[str]:

def get_terminal_width() -> int:
"""Get current terminal width if possible, otherwise return the default one."""
try:
cols, _ = os.get_terminal_size()
except OSError:
return DEFAULT_COLUMNS
else:
if cols == 0:
return DEFAULT_COLUMNS
return cols
return int(os.getenv('MYPY_FORCE_TERMINAL_WIDTH', '0')) or shutil.get_terminal_size().columns


def soft_wrap(msg: str, max_len: int, first_offset: int,
Expand Down Expand Up @@ -594,8 +587,7 @@ def style(self, text: str, color: Literal['red', 'green', 'blue', 'yellow', 'non
def fit_in_terminal(self, messages: List[str],
fixed_terminal_width: Optional[int] = None) -> List[str]:
"""Improve readability by wrapping error messages and trimming source code."""
width = (fixed_terminal_width or int(os.getenv('MYPY_FORCE_TERMINAL_WIDTH', '0')) or
get_terminal_width())
width = fixed_terminal_width or get_terminal_width()
new_messages = messages.copy()
for i, error in enumerate(messages):
if ': error:' in error:
Expand All @@ -619,11 +611,7 @@ def fit_in_terminal(self, messages: List[str],
return new_messages

def colorize(self, error: str) -> str:
"""Colorize an output line by highlighting the status and error code.

If fixed_terminal_width is given, use it instead of calling get_terminal_width()
(used by the daemon).
"""
"""Colorize an output line by highlighting the status and error code."""
if ': error:' in error:
loc, msg = error.split('error:', maxsplit=1)
if not self.show_error_codes:
Expand Down