diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-04-05 19:55:46 +0200 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-04-05 19:55:46 +0200 |
commit | 83ed63b168e4c05bf8036e0c72a2460b9e6fa29b (patch) | |
tree | 2fe7f9871c876fb18d3a598acbbfecbe1101216f /scripts/cpu_distribution.py | |
parent | 3204eaf4d244f1a76d1c20b2fb9773ad36db4e22 (diff) | |
download | psutil-83ed63b168e4c05bf8036e0c72a2460b9e6fa29b.tar.gz |
move get_terminal_size() in _compat.py
Diffstat (limited to 'scripts/cpu_distribution.py')
-rwxr-xr-x | scripts/cpu_distribution.py | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/scripts/cpu_distribution.py b/scripts/cpu_distribution.py index 67f25b2d..c509c732 100755 --- a/scripts/cpu_distribution.py +++ b/scripts/cpu_distribution.py @@ -46,6 +46,7 @@ import sys import time import psutil +from psutil._compat import get_terminal_size if not hasattr(psutil.Process, "cpu_num"): @@ -59,24 +60,6 @@ def clean_screen(): os.system('cls') -def get_terminal_size(fallback=(80, 24)): - try: - # Added in Python 3.3 - from shutil import get_terminal_size as gts - return gts(fallback=fallback) - except ImportError: - try: - # This should work on Linux. - import fcntl - import termios - import struct - res = struct.unpack( - 'hh', fcntl.ioctl(1, termios.TIOCGWINSZ, '1234')) - return (res[1], res[0]) - except Exception: - return fallback - - def main(): num_cpus = psutil.cpu_count() if num_cpus > 8: |