summaryrefslogtreecommitdiff
path: root/src/flake8
diff options
context:
space:
mode:
authorAnthony Sottile <asottile@umich.edu>2021-03-29 18:13:11 -0700
committerAnthony Sottile <asottile@umich.edu>2021-03-30 17:37:13 -0700
commit4d57a20ffd3afed446743c40410a78c6fe7a1a9d (patch)
tree1a59e4e321725ed55422e8df98a3489c655936a0 /src/flake8
parent3a85c8ce96d5c7c4c8250921734a826ac95e89b3 (diff)
downloadflake8-4d57a20ffd3afed446743c40410a78c6fe7a1a9d.tar.gz
clean up readlines_py2
Diffstat (limited to 'src/flake8')
-rw-r--r--src/flake8/processor.py18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/flake8/processor.py b/src/flake8/processor.py
index 30c49ac..20a99de 100644
--- a/src/flake8/processor.py
+++ b/src/flake8/processor.py
@@ -3,7 +3,6 @@ import argparse
import ast
import contextlib
import logging
-import sys
import tokenize
from typing import Any
from typing import Dict
@@ -352,13 +351,9 @@ class FileProcessor:
lines = self.read_lines_from_filename()
return lines
- def _readlines_py2(self):
- # type: () -> List[str]
- with open(self.filename) as fd:
- return fd.readlines()
-
- def _readlines_py3(self):
+ def read_lines_from_filename(self):
# type: () -> List[str]
+ """Read the lines for a file."""
try:
with tokenize.open(self.filename) as fd:
return fd.readlines()
@@ -368,15 +363,6 @@ class FileProcessor:
with open(self.filename, encoding="latin-1") as fd:
return fd.readlines()
- def read_lines_from_filename(self):
- # type: () -> List[str]
- """Read the lines for a file."""
- if (2, 6) <= sys.version_info < (3, 0):
- readlines = self._readlines_py2
- elif (3, 0) <= sys.version_info < (4, 0):
- readlines = self._readlines_py3
- return readlines()
-
def read_lines_from_stdin(self):
# type: () -> List[str]
"""Read the lines from standard in."""