From a045ac3bd7ad5fe5ab1dd2d0f609c6f744bc24c1 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 18 Oct 2018 12:15:37 +0200 Subject: [PATCH] Decode tic stderr using utf-8 --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index cb873c03c..5e9ee5e79 100755 --- a/setup.py +++ b/setup.py @@ -599,9 +599,9 @@ def package(args, for_bundle=False, sh_launcher=False): for x in (libdir, os.path.join(ddir, 'share')): odir = os.path.join(x, 'terminfo') safe_makedirs(odir) - proc = subprocess.run(['tic', '-x', '-o' + odir, 'terminfo/kitty.terminfo'], check=True, text=True, stderr=subprocess.PIPE) + proc = subprocess.run(['tic', '-x', '-o' + odir, 'terminfo/kitty.terminfo'], check=True, stderr=subprocess.PIPE) regex = '^"terminfo/kitty.terminfo", line [0-9]+, col [0-9]+, terminal \'xterm-kitty\': older tic versions may treat the description field as an alias$' - err_msg = proc.stderr.rstrip() + err_msg = proc.stderr.decode('utf-8').rstrip() if not re.match(regex, err_msg): print(err_msg, file=sys.stderr) if not glob.glob(os.path.join(odir, '*/xterm-kitty')):