From 58e1f6ee1f29e661edbd3d04b14facffd19c9673 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Tue, 4 Jan 2022 20:25:16 +0530 Subject: [PATCH] Use ctermid() for tty_name --- kitty/debug_config.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/kitty/debug_config.py b/kitty/debug_config.py index 116cea524..5d4dba309 100644 --- a/kitty/debug_config.py +++ b/kitty/debug_config.py @@ -7,6 +7,7 @@ import socket import sys import termios import time +from contextlib import suppress from functools import partial from pprint import pformat from typing import ( @@ -19,7 +20,7 @@ from .cli import version from .constants import ( extensions_dir, is_macos, is_wayland, kitty_base_dir, kitty_exe, shell_path ) -from .fast_data_types import num_users, Color +from .fast_data_types import Color, num_users from .options.types import Options as KittyOpts, defaults from .options.utils import MouseMap from .rgb import color_as_sharp @@ -170,14 +171,14 @@ class IssueData: self.formatted_time = self.d = time.strftime('%a %b %d %Y', _time) self.formatted_date = self.t = time.strftime('%H:%M:%S', _time) try: - self.tty_name = format_tty_name(os.ttyname(sys.stdin.fileno())) + self.tty_name = format_tty_name(os.ctermid()) except OSError: self.tty_name = '(none)' self.l = self.tty_name # noqa + self.baud_rate = 0 if sys.stdin.isatty(): - self.baud_rate = termios.tcgetattr(sys.stdin.fileno())[5] - else: - self.baud_rate = 0 + with suppress(OSError): + self.baud_rate = termios.tcgetattr(sys.stdin.fileno())[5] self.b = str(self.baud_rate) try: self.num_users = num_users()