mirror of
https://github.com/PyCQA/flake8.git
synced 2026-04-04 20:26:53 +00:00
Merge branch 'match_newlines_py3' into 'master'
Fix inconsistent newlines read from a file in python3 Closes #457 See merge request pycqa/flake8!253
This commit is contained in:
commit
63b91c95ea
2 changed files with 29 additions and 6 deletions
|
|
@ -27,6 +27,32 @@ def test_read_lines_splits_lines():
|
|||
for line in lines)
|
||||
|
||||
|
||||
def lines_from_file(tmpdir, lines):
|
||||
f = tmpdir.join('f.py')
|
||||
f.write(''.join(lines))
|
||||
return processor.FileProcessor(f.strpath, options_from()).lines
|
||||
|
||||
|
||||
def test_read_lines_universal_newlines(tmpdir):
|
||||
r"""Verify that line endings are translated to \n."""
|
||||
lines = lines_from_file(tmpdir, ['# coding: utf-8\r\n', 'x = 1\r\n'])
|
||||
assert lines == ['# coding: utf-8\n', 'x = 1\n']
|
||||
|
||||
|
||||
def test_read_lines_incorrect_utf_16(tmpdir):
|
||||
"""Verify that a file which incorrectly claims it is utf16 is still read
|
||||
as latin-1.
|
||||
"""
|
||||
lines = lines_from_file(tmpdir, ['# coding: utf16\n', 'x = 1\n'])
|
||||
assert lines == ['# coding: utf16\n', 'x = 1\n']
|
||||
|
||||
|
||||
def test_read_lines_unknown_encoding(tmpdir):
|
||||
"""Verify that an unknown encoding is still read as latin-1."""
|
||||
lines = lines_from_file(tmpdir, ['# coding: fake-encoding\n', 'x = 1\n'])
|
||||
assert lines == ['# coding: fake-encoding\n', 'x = 1\n']
|
||||
|
||||
|
||||
@pytest.mark.parametrize('first_line', [
|
||||
'\xEF\xBB\xBF"""Module docstring."""\n',
|
||||
u'\uFEFF"""Module docstring."""\n',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue