Merge "Use universal_newlines with subprocess.check_output"

os_collect_config/config_drive.py

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

tox.ini

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