Browse Source

Merge "Use universal_newlines with subprocess.check_output"

Jenkins 2 years ago
parent
commit
7b8d598d1c
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      os_collect_config/config_drive.py
  2. 1
    1
      tox.ini

+ 1
- 1
os_collect_config/config_drive.py View File

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

+ 1
- 1
tox.ini View File

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

Loading…
Cancel
Save