third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-17 00:04:42 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove pre_commit.five

Browse source
This commit is contained in:
Anthony Sottile 2020-01-12 11:44:41 -08:00
parent f33716cc17
commit 67c2dcd90d
10 changed files with 33 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

17
pre_commit/util.py
View file

@ -17,7 +17,6 @@ from typing import Tuple
from typing import Type
from typing import Union
from pre_commit import five
from pre_commit import parse_shebang
if sys.version_info >= (3, 7): # pragma: no cover (PY37+)
@ -116,19 +115,9 @@ class CalledProcessError(RuntimeError):
return self.__bytes__().decode()
def _cmd_kwargs(
*cmd: str,
**kwargs: Any,
) -> Tuple[Tuple[str, ...], Dict[str, Any]]:
# py2/py3 on windows are more strict about the types here
cmd = tuple(five.n(arg) for arg in cmd)
kwargs['env'] = {
five.n(key): five.n(value)
for key, value in kwargs.pop('env', {}).items()
} or None
def _setdefault_kwargs(kwargs: Dict[str, Any]) -> None:
for arg in ('stdin', 'stdout', 'stderr'):
kwargs.setdefault(arg, subprocess.PIPE)
return cmd, kwargs
def cmd_output_b(
@ -136,7 +125,7 @@ def cmd_output_b(
**kwargs: Any,
) -> Tuple[int, bytes, Optional[bytes]]:
retcode = kwargs.pop('retcode', 0)
cmd, kwargs = _cmd_kwargs(*cmd, **kwargs)
_setdefault_kwargs(kwargs)
try:
cmd = parse_shebang.normalize_cmd(cmd)
@ -205,7 +194,7 @@ if os.name != 'nt': # pragma: windows no cover
) -> Tuple[int, bytes, Optional[bytes]]:
assert kwargs.pop('retcode') is None
assert kwargs['stderr'] == subprocess.STDOUT, kwargs['stderr']
cmd, kwargs = _cmd_kwargs(*cmd, **kwargs)
_setdefault_kwargs(kwargs)
try:
cmd = parse_shebang.normalize_cmd(cmd)