From a84769890b266eaab5f209f595361bd9ee9c241b Mon Sep 17 00:00:00 2001 From: Florent Le Coz Date: Sat, 22 Jan 2011 15:03:54 +0100 Subject: fix get_output_of_command. fixed #2018 --- src/common.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/common.py') diff --git a/src/common.py b/src/common.py index b909977c..141b67be 100644 --- a/src/common.py +++ b/src/common.py @@ -40,10 +40,7 @@ import hashlib import subprocess import curses import sys -import select -import errno import time -import traceback ROOM_STATE_NONE = 11 ROOM_STATE_CURRENT = 10 @@ -72,16 +69,10 @@ def get_output_of_command(command): Runs a command and returns its output """ try: - child_stdin, child_stdout = os.popen2(command) - except ValueError: + return subprocess.check_output(command.split()).decode('utf-8').split('\n') + except subprocess.CalledProcessError: return None - output = child_stdout.readlines() - child_stdout.close() - child_stdin.close() - - return output - def is_in_path(command, return_abs_path=False): """ Return True if 'command' is found in one of the directories in the user's -- cgit v1.2.3