Merge pull request #1314 from bjones1/py3.5

Fix: Use Python 3.5-compatible keywords for subprocess.

Author: bnmnetp

tests/ci_utils.py

@@ -10,7 +10,7 @@
 # Standard library
 # ----------------
 from __future__ import print_function
-from subprocess import run
+from subprocess import run, PIPE
 import sys
 import os
 import os.path
@@ -58,7 +58,7 @@ def xqt(
         # works. See https://docs.python.org/3/library/subprocess.html#subprocess.Popen.
         executable = ('/bin/bash' if is_linux or is_darwin
                       else None)
-        ret.append(run(_, shell=True, capture_output=True,
+        ret.append(run(_, shell=True, stdout=PIPE, stderr=PIPE,
                        executable=executable, **kwargs))
 
     # Return a list only if there were multiple commands to execute.

tests/conftest.py

@@ -67,7 +67,8 @@ def pytest_addoption(parser):
 # Output a coverage report when testing is done. See https://docs.pytest.org/en/latest/reference.html#_pytest.hookspec.pytest_terminal_summary.
 def pytest_terminal_summary(terminalreporter):
     with pushd('../../..'):
-        cp = xqt('{} -m coverage report'.format(sys.executable), text=True)
+        cp = xqt('{} -m coverage report'.format(sys.executable),
+                 universal_newlines=True)
     terminalreporter.write_line(cp.stdout + cp.stderr)