openstack/os-collect-config
Code Issues Proposed changes

Merge "Use universal_newlines with subprocess.check_output"

Browse Source
This commit is contained in:
Jenkins 2017-04-13 05:34:40 +00:00 committed by Gerrit Code Review
commit 7b8d598d1c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
os_collect_config/config_drive.py
View File

@ -147,7 +147,7 @@ def all_block_devices():
'''Run blkid and yield a BlockDevice for all devices.''' '''Run blkid and yield a BlockDevice for all devices.'''
try: try:
cmd = ['blkid', '-o', 'export'] cmd = ['blkid', '-o', 'export']
out = subprocess.check_output(cmd) out = subprocess.check_output(cmd, universal_newlines=True)
except Exception as e: except Exception as e:
logger.error('Problem running "%s": %s', ' '.join(cmd), e) logger.error('Problem running "%s": %s', ' '.join(cmd), e)
else: else:

2
tox.ini
View File

@ -1,7 +1,7 @@
[tox] [tox]
minversion = 2.0 minversion = 2.0
skipsdist = True skipsdist = True
envlist = py27,pep8 envlist = py35,py27,pep8
[testenv] [testenv]
usedevelop = True usedevelop = True