pre-commit/flake8
1
0
Fork 0
mirror of https://github.com/PyCQA/flake8.git synced 2026-04-07 05:26:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix up merge request 78

Browse source 
This simplifies the changes, reduces the scope of refactors apparently
for refactoring's sake and ensures that the internals are reasonable.

It also airs on the side of preserving information rather than
discarding or overwriting it.
This commit is contained in:
Ian Cordasco 2016-07-20 19:28:13 -05:00
parent 7934f8dce2
commit a1fdb5a2b5
No known key found for this signature in database
GPG key ID: 656D3395E4A9791A
5 changed files with 54 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/flake8/processor.py
View file

@ -59,8 +59,7 @@ class FileProcessor(object):
self.filename = filename
self.lines = lines
if lines is None:
# allow for stdin filename substitution
self.filename, self.lines = self.read_lines(filename)
self.lines = self.read_lines()
self.strip_utf_bom()
# Defaults for public attributes
@ -269,15 +268,15 @@ class FileProcessor(object):
self.indent_char = line[0]
return line
def read_lines(self, filename):
def read_lines(self):
# type: () -> List[str]
"""Read the lines for this file checker."""
if filename is None or filename == '-':
filename = self.options.stdin_display_name or 'stdin'
if self.filename is None or self.filename == '-':
self.filename = self.options.stdin_display_name
lines = self.read_lines_from_stdin()
else:
lines = self.read_lines_from_filename()
return (filename, lines)
return lines
def _readlines_py2(self):
# type: () -> List[str]