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

Compute win32 python2 length according to encoded size

Browse source
This commit is contained in:
Anthony Sottile 2018-10-23 22:02:48 -07:00
parent 3d573d8736
commit ead906aed0
2 changed files with 43 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pre_commit/xargs.py
View file

@ -3,6 +3,8 @@ from __future__ import unicode_literals
import sys import sys
import six
from pre_commit import parse_shebang from pre_commit import parse_shebang
from pre_commit.util import cmd_output from pre_commit.util import cmd_output
@ -19,9 +21,13 @@ def _command_length(*cmd):
# win32 uses the amount of characters, more details at: # win32 uses the amount of characters, more details at:
# https://github.com/pre-commit/pre-commit/pull/839 # https://github.com/pre-commit/pre-commit/pull/839
if sys.platform == 'win32': if sys.platform == 'win32':
return len(full_cmd.encode('utf-16le')) // 2 # the python2.x apis require bytes, we encode as UTF-8
if six.PY2:
return len(full_cmd.encode(sys.getfilesystemencoding())) return len(full_cmd.encode('utf-8'))
else:
return len(full_cmd.encode('utf-16le')) // 2
else:
return len(full_cmd.encode(sys.getfilesystemencoding()))
class ArgumentTooLongError(RuntimeError): class ArgumentTooLongError(RuntimeError):

56
tests/xargs_test.py
View file

@ -2,26 +2,36 @@
from __future__ import absolute_import from __future__ import absolute_import
from __future__ import unicode_literals from __future__ import unicode_literals
import sys
import mock import mock
import pytest import pytest
import six
from pre_commit import xargs from pre_commit import xargs
@pytest.fixture @pytest.fixture
def sys_win32_mock(): def win32_py2_mock():
return mock.Mock( with mock.patch.object(sys, 'getfilesystemencoding', return_value='utf-8'):
platform='win32', with mock.patch.object(sys, 'platform', 'win32'):
getfilesystemencoding=mock.Mock(return_value='utf-8'), with mock.patch.object(six, 'PY2', True):
) yield
@pytest.fixture @pytest.fixture
def sys_linux_mock(): def win32_py3_mock():
return mock.Mock( with mock.patch.object(sys, 'getfilesystemencoding', return_value='utf-8'):
platform='linux', with mock.patch.object(sys, 'platform', 'win32'):
getfilesystemencoding=mock.Mock(return_value='utf-8'), with mock.patch.object(six, 'PY2', False):
) yield
@pytest.fixture
def linux_mock():
with mock.patch.object(sys, 'getfilesystemencoding', return_value='utf-8'):
with mock.patch.object(sys, 'platform', 'linux'):
yield
def test_partition_trivial(): def test_partition_trivial():
@ -53,31 +63,33 @@ def test_partition_limits():
) )
def test_partition_limit_win32(sys_win32_mock): def test_partition_limit_win32_py3(win32_py3_mock):
cmd = ('ninechars',) cmd = ('ninechars',)
# counted as half because of utf-16 encode # counted as half because of utf-16 encode
varargs = ('😑' * 5,) varargs = ('😑' * 5,)
with mock.patch('pre_commit.xargs.sys', sys_win32_mock): ret = xargs.partition(cmd, varargs, _max_length=20)
ret = xargs.partition(cmd, varargs, _max_length=20)
assert ret == (cmd + varargs,) assert ret == (cmd + varargs,)
def test_partition_limit_linux(sys_linux_mock): def test_partition_limit_win32_py2(win32_py2_mock):
cmd = ('ninechars',)
varargs = ('😑' * 5,) # 4 bytes * 5
ret = xargs.partition(cmd, varargs, _max_length=30)
assert ret == (cmd + varargs,)
def test_partition_limit_linux(linux_mock):
cmd = ('ninechars',) cmd = ('ninechars',)
varargs = ('😑' * 5,) varargs = ('😑' * 5,)
with mock.patch('pre_commit.xargs.sys', sys_linux_mock): ret = xargs.partition(cmd, varargs, _max_length=30)
ret = xargs.partition(cmd, varargs, _max_length=30)
assert ret == (cmd + varargs,) assert ret == (cmd + varargs,)
def test_argument_too_long_with_large_unicode(sys_linux_mock): def test_argument_too_long_with_large_unicode(linux_mock):
cmd = ('ninechars',) cmd = ('ninechars',)
varargs = ('😑' * 10,) # 4 bytes * 10 varargs = ('😑' * 10,) # 4 bytes * 10
with mock.patch('pre_commit.xargs.sys', sys_linux_mock): with pytest.raises(xargs.ArgumentTooLongError):
with pytest.raises(xargs.ArgumentTooLongError): xargs.partition(cmd, varargs, _max_length=20)
xargs.partition(cmd, varargs, _max_length=20)
def test_argument_too_long(): def test_argument_too_long():