From 2eaed493edab87f9da4f84fc64a679e81e758dbd Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Nov 07 2018 11:43:04 +0000 Subject: inventory: There is no StringIO in python3 We don't need to use StringIO in standard-inventory-qcow2 It's not available by default in python3 and it doesn't have a useful use here. --- diff --git a/inventory/standard-inventory-qcow2 b/inventory/standard-inventory-qcow2 index 7bb55ea..4012cb6 100755 --- a/inventory/standard-inventory-qcow2 +++ b/inventory/standard-inventory-qcow2 @@ -10,7 +10,6 @@ import shutil import shlex import signal import logging -import StringIO import random import socket import subprocess @@ -171,7 +170,7 @@ def get_qemu_smp_arg(): available_cpu = int(subprocess.check_output(['nproc']).strip()) # https://stackoverflow.com/questions/6481005/how-to-obtain-the-number-of-cpus-cores-in-linux-from-the-command-line core_sockets = set() - for line in StringIO.StringIO(subprocess.check_output(['lscpu', '-b', '-p=Core,Socket'])): + for line in subprocess.check_output(['lscpu', '-b', '-p=Core,Socket'], universal_newlines=True).split("\n"): if line.startswith('#'): continue core_sockets.add(line.strip())