mirror of
https://github.com/PyCQA/flake8.git
synced 2026-04-10 14:54:17 +00:00
Fixing integration with pytest-flake8
This commit is contained in:
parent
ecee230c6f
commit
764ecb0e48
2 changed files with 42 additions and 1 deletions
|
|
@ -179,12 +179,24 @@ class BaseFormatter:
|
||||||
# one
|
# one
|
||||||
return f"{error.physical_line}{indent}^"
|
return f"{error.physical_line}{indent}^"
|
||||||
|
|
||||||
|
def _stdoutWriteHook(self, value: str) -> None:
|
||||||
|
"""An alternative to print() function that handles output terminal encoding."""
|
||||||
|
try:
|
||||||
|
sys.stdout.write(value)
|
||||||
|
except UnicodeEncodeError:
|
||||||
|
byteValue = value.encode(sys.stdout.encoding, 'backslashreplace')
|
||||||
|
if hasattr(sys.stdout, 'buffer'):
|
||||||
|
sys.stdout.buffer.write(byteValue)
|
||||||
|
else:
|
||||||
|
sys.stdout.write(byteValue.decode(sys.stdout.encoding, 'strict'))
|
||||||
|
|
||||||
def _write(self, output: str) -> None:
|
def _write(self, output: str) -> None:
|
||||||
"""Handle logic of whether to use an output file or print()."""
|
"""Handle logic of whether to use an output file or print()."""
|
||||||
if self.output_fd is not None:
|
if self.output_fd is not None:
|
||||||
self.output_fd.write(output + self.newline)
|
self.output_fd.write(output + self.newline)
|
||||||
if self.output_fd is None or self.options.tee:
|
if self.output_fd is None or self.options.tee:
|
||||||
sys.stdout.buffer.write(output.encode() + self.newline.encode())
|
self._stdoutWriteHook(output)
|
||||||
|
self._stdoutWriteHook(self.newline)
|
||||||
|
|
||||||
def write(self, line: Optional[str], source: Optional[str]) -> None:
|
def write(self, line: Optional[str], source: Optional[str]) -> None:
|
||||||
"""Write the line either to the output file or stdout.
|
"""Write the line either to the output file or stdout.
|
||||||
|
|
|
||||||
|
|
@ -136,6 +136,35 @@ def test_write_produces_stdout(capsys):
|
||||||
assert capsys.readouterr().out == f"{line}\n{source}\n"
|
assert capsys.readouterr().out == f"{line}\n{source}\n"
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.parametrize('buffered_stdout', [True, False])
|
||||||
|
def test_write_hook_fallbacks(buffered_stdout):
|
||||||
|
mock_line = mock.Mock(name='Mock Line')
|
||||||
|
|
||||||
|
stdout_spec = ['write', 'encoding']
|
||||||
|
if buffered_stdout:
|
||||||
|
stdout_spec.append('buffer')
|
||||||
|
|
||||||
|
with mock.patch('sys.stdout', spec=stdout_spec) as mock_stdout:
|
||||||
|
def _stdoutWriteEffect(value):
|
||||||
|
if value is mock_line:
|
||||||
|
raise UnicodeEncodeError('unittest-codec', u'', 42, 43, 'NOPE')
|
||||||
|
return None
|
||||||
|
mock_stdout.write.side_effect = _stdoutWriteEffect
|
||||||
|
|
||||||
|
mock_stdout.encoding = 'ascii'
|
||||||
|
|
||||||
|
formatter = base.BaseFormatter(options())
|
||||||
|
formatter.write(mock_line, None)
|
||||||
|
|
||||||
|
mock_line.encode.assert_called_once_with('ascii', 'backslashreplace')
|
||||||
|
byte_mock_line = mock_line.encode.return_value
|
||||||
|
if buffered_stdout:
|
||||||
|
mock_stdout.buffer.write.assert_any_call(byte_mock_line)
|
||||||
|
else:
|
||||||
|
byte_mock_line.decode.assert_called_once_with('ascii', 'strict')
|
||||||
|
mock_stdout.write.assert_any_call(byte_mock_line.decode.return_value)
|
||||||
|
|
||||||
|
|
||||||
class AfterInitFormatter(base.BaseFormatter):
|
class AfterInitFormatter(base.BaseFormatter):
|
||||||
"""Subclass for testing after_init."""
|
"""Subclass for testing after_init."""
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue