From 60716fcd6debd9f1ebca0091c945df16a3bd3715 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Wed, 7 Dec 2016 07:03:15 +0530 Subject: Use universal_newlines=True for all Popen calls Instead of adding it everywhere manually, create a wrapper called mesonlib.Popen_safe and use that everywhere that we call an executable and extract its output. This will also allow us to tweak it to do more/different things if needed for some locales and/or systems. Closes #1079 --- mesonbuild/modules/qt5.py | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'mesonbuild/modules/qt5.py') diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py index 52ad155..56c6269 100644 --- a/mesonbuild/modules/qt5.py +++ b/mesonbuild/modules/qt5.py @@ -15,7 +15,7 @@ import os, subprocess from .. import mlog from .. import build -from ..mesonlib import MesonException +from ..mesonlib import MesonException, Popen_safe from ..dependencies import Qt5Dependency import xml.etree.ElementTree as ET @@ -37,11 +37,9 @@ class Qt5Module(): # Moc and rcc return a non-zero result when doing so. # What kind of an idiot thought that was a good idea? if self.moc.found(): - mp = subprocess.Popen(self.moc.get_command() + ['-v'], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - (stdout, stderr) = mp.communicate() - stdout = stdout.decode().strip() - stderr = stderr.decode().strip() + stdout, stderr = Popen_safe(self.moc.get_command() + ['-v'])[1:3] + stdout = stdout.strip() + stderr = stderr.strip() if 'Qt 5' in stderr: moc_ver = stderr elif '5.' in stdout: @@ -54,11 +52,9 @@ class Qt5Module(): else: mlog.log(' moc:', mlog.red('NO')) if self.uic.found(): - up = subprocess.Popen(self.uic.get_command() + ['-v'], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - (stdout, stderr) = up.communicate() - stdout = stdout.decode().strip() - stderr = stderr.decode().strip() + stdout, stderr = Popen_safe(self.uic.get_command() + ['-v'])[1:3] + stdout = stdout.strip() + stderr = stderr.strip() if 'version 5.' in stderr: uic_ver = stderr elif '5.' in stdout: @@ -71,11 +67,9 @@ class Qt5Module(): else: mlog.log(' uic:', mlog.red('NO')) if self.rcc.found(): - rp = subprocess.Popen(self.rcc.get_command() + ['-v'], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - (stdout, stderr) = rp.communicate() - stdout = stdout.decode().strip() - stderr = stderr.decode().strip() + stdout, stderr = Popen_safe(self.rcc.get_command() + ['-v'])[1:3] + stdout = stdout.strip() + stderr = stderr.strip() if 'version 5.' in stderr: rcc_ver = stderr elif '5.' in stdout: -- cgit v1.1