Split out cmd_output_b

pre_commit/languages/docker.py

@@ -9,7 +9,7 @@ from pre_commit import five
 from pre_commit.languages import helpers
 from pre_commit.util import CalledProcessError
 from pre_commit.util import clean_path_on_failure
-from pre_commit.util import cmd_output
+from pre_commit.util import cmd_output_b
 
 
 ENVIRONMENT_DIR = 'docker'
@@ -29,9 +29,11 @@ def docker_tag(prefix):  # pragma: windows no cover
 
 def docker_is_running():  # pragma: windows no cover
     try:
-        return cmd_output('docker', 'ps')[0] == 0
+        cmd_output_b('docker', 'ps')
     except CalledProcessError:
         return False
+    else:
+        return True
 
 
 def assert_docker_available():  # pragma: windows no cover

pre_commit/languages/golang.py

@@ -11,6 +11,7 @@ from pre_commit.envcontext import Var
 from pre_commit.languages import helpers
 from pre_commit.util import clean_path_on_failure
 from pre_commit.util import cmd_output
+from pre_commit.util import cmd_output_b
 from pre_commit.util import rmtree
 
 
@@ -70,9 +71,9 @@ def install_environment(prefix, version, additional_dependencies):
             gopath = directory
         env = dict(os.environ, GOPATH=gopath)
         env.pop('GOBIN', None)
-        cmd_output('go', 'get', './...', cwd=repo_src_dir, env=env)
+        cmd_output_b('go', 'get', './...', cwd=repo_src_dir, env=env)
         for dependency in additional_dependencies:
-            cmd_output('go', 'get', dependency, cwd=repo_src_dir, env=env)
+            cmd_output_b('go', 'get', dependency, cwd=repo_src_dir, env=env)
         # Same some disk space, we don't need these after installation
         rmtree(prefix.path(directory, 'src'))
         pkgdir = prefix.path(directory, 'pkg')

pre_commit/languages/helpers.py

@@ -8,14 +8,14 @@ import shlex
 import six
 
 import pre_commit.constants as C
-from pre_commit.util import cmd_output
+from pre_commit.util import cmd_output_b
 from pre_commit.xargs import xargs
 
 FIXED_RANDOM_SEED = 1542676186
 
 
 def run_setup_cmd(prefix, cmd):
-    cmd_output(*cmd, cwd=prefix.prefix_dir, encoding=None)
+    cmd_output_b(*cmd, cwd=prefix.prefix_dir)
 
 
 def environment_dir(ENVIRONMENT_DIR, language_version):

pre_commit/languages/node.py

@@ -11,6 +11,7 @@ from pre_commit.languages import helpers
 from pre_commit.languages.python import bin_dir
 from pre_commit.util import clean_path_on_failure
 from pre_commit.util import cmd_output
+from pre_commit.util import cmd_output_b
 
 
 ENVIRONMENT_DIR = 'node_env'
@@ -65,7 +66,7 @@ def install_environment(
         ]
         if version != C.DEFAULT:
             cmd.extend(['-n', version])
-        cmd_output(*cmd)
+        cmd_output_b(*cmd)
 
         with in_env(prefix, version):
             # https://npm.community/t/npm-install-g-git-vs-git-clone-cd-npm-install-g/5449

pre_commit/languages/python.py

@@ -13,6 +13,7 @@ from pre_commit.parse_shebang import find_executable
 from pre_commit.util import CalledProcessError
 from pre_commit.util import clean_path_on_failure
 from pre_commit.util import cmd_output
+from pre_commit.util import cmd_output_b
 
 
 ENVIRONMENT_DIR = 'py_env'
@@ -143,11 +144,10 @@ def py_interface(_dir, _make_venv):
 
     def healthy(prefix, language_version):
         with in_env(prefix, language_version):
-            retcode, _, _ = cmd_output(
+            retcode, _, _ = cmd_output_b(
                 'python', '-c',
                 'import ctypes, datetime, io, os, ssl, weakref',
                 retcode=None,
-                encoding=None,
             )
         return retcode == 0
 
@@ -177,7 +177,7 @@ def py_interface(_dir, _make_venv):
 def make_venv(envdir, python):
     env = dict(os.environ, VIRTUALENV_NO_DOWNLOAD='1')
     cmd = (sys.executable, '-mvirtualenv', envdir, '-p', python)
-    cmd_output(*cmd, env=env, cwd='/')
+    cmd_output_b(*cmd, env=env, cwd='/')
 
 
 _interface = py_interface(ENVIRONMENT_DIR, make_venv)

pre_commit/languages/python_venv.py

@@ -6,6 +6,7 @@ import sys
 from pre_commit.languages import python
 from pre_commit.util import CalledProcessError
 from pre_commit.util import cmd_output
+from pre_commit.util import cmd_output_b
 
 
 ENVIRONMENT_DIR = 'py_venv'
@@ -48,7 +49,7 @@ def orig_py_exe(exe):  # pragma: no cover (platform specific)
 
 
 def make_venv(envdir, python):
-    cmd_output(orig_py_exe(python), '-mvenv', envdir, cwd='/')
+    cmd_output_b(orig_py_exe(python), '-mvenv', envdir, cwd='/')
 
 
 _interface = python.py_interface(ENVIRONMENT_DIR, make_venv)

pre_commit/languages/rust.py

@@ -10,7 +10,7 @@ from pre_commit.envcontext import envcontext
 from pre_commit.envcontext import Var
 from pre_commit.languages import helpers
 from pre_commit.util import clean_path_on_failure
-from pre_commit.util import cmd_output
+from pre_commit.util import cmd_output_b
 
 
 ENVIRONMENT_DIR = 'rustenv'
@@ -83,7 +83,7 @@ def install_environment(prefix, version, additional_dependencies):
                 packages_to_install.add((package,))
 
         for package in packages_to_install:
-            cmd_output(
+            cmd_output_b(
                 'cargo', 'install', '--bins', '--root', directory, *package,
                 cwd=prefix.prefix_dir
             )

pre_commit/languages/swift.py

@@ -8,7 +8,7 @@ from pre_commit.envcontext import envcontext
 from pre_commit.envcontext import Var
 from pre_commit.languages import helpers
 from pre_commit.util import clean_path_on_failure
-from pre_commit.util import cmd_output
+from pre_commit.util import cmd_output_b
 
 ENVIRONMENT_DIR = 'swift_env'
 get_default_version = helpers.basic_get_default_version
@@ -43,7 +43,7 @@ def install_environment(
     # Build the swift package
     with clean_path_on_failure(directory):
         os.mkdir(directory)
-        cmd_output(
+        cmd_output_b(
             'swift', 'build',
             '-C', prefix.prefix_dir,
             '-c', BUILD_CONFIG,