Remove most of five

This commit is contained in:
Anthony Sottile
2014-06-06 07:52:02 -07:00
parent 01b557c497
commit 9b03068189
2 changed files with 2 additions and 73 deletions

View File

@@ -2,8 +2,6 @@ import os
import os.path
import subprocess
from pre_commit import five
class CalledProcessError(RuntimeError):
def __init__(self, returncode, cmd, expected_returncode, output=None):
@@ -70,11 +68,10 @@ class PrefixedCommandRunner(object):
replaced_cmd = _replace_cmd(cmd, prefix=self.prefix_dir)
proc = self.__popen(replaced_cmd, **popen_kwargs)
stdout, stderr = proc.communicate(stdin)
# TODO: stdout, stderr = from_bytes(stdout), from_bytes(stderr)
if isinstance(stdout, bytes):
stdout = five.text(stdout, 'utf-8')
stdout = stdout.decode('UTF-8')
if isinstance(stderr, bytes):
stderr = five.text(stderr, 'utf-8')
stderr = stderr.decode('UTF-8')
returncode = proc.returncode
if retcode is not None and retcode != returncode: