Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

burn the bridges with python 2.x #707

Merged
merged 13 commits into from Jun 12, 2022
Merged

burn the bridges with python 2.x #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
75446ff
pyupgrade --py36-plus
asottile May 30, 2022
511ba4b
remove handling of PY2
asottile May 30, 2022
243f352
remove handling of PY35_PLUS
asottile May 30, 2022
3b0419b
remove handling of PY36_PLUS
asottile May 30, 2022
80aad86
remove obsolete version_info checks in pyflakes/
asottile May 30, 2022
c68b7f5
adjust skips in tests for 3.6+
asottile May 30, 2022
b62ed4f
is_py3_func -> has_annotations (specifically for lambda)
asottile May 30, 2022
39e7450
remove references to py 2
asottile May 30, 2022
44f432a
remove references to unichr
asottile May 30, 2022
d0e37c3
clean up version-specific getattrs
asottile May 30, 2022
df73087
remove unused ReturnWithArgsInsideGenerator
asottile May 30, 2022
984e9e4
remove unused ast handlers
asottile May 30, 2022
f1bd4b1
remove unused RedefinedInListComp
asottile May 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions pyflakes/api.py
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@

__all__ = ['check', 'checkPath', 'checkRecursive', 'iterSourceCode', 'main']

PYTHON_SHEBANG_REGEX = re.compile(br'^#!.*\bpython([23](\.\d+)?|w)?[dmu]?\s')
PYTHON_SHEBANG_REGEX = re.compile(br'^#!.*\bpython(3(\.\d+)?|w)?[dmu]?\s')


def check(codeString, filename, reporter=None):
Expand Down Expand Up @@ -48,7 +48,7 @@ def check(codeString, filename, reporter=None):
lines = codeString.splitlines()
if len(lines) >= lineno:
text = lines[lineno - 1]
if sys.version_info >= (3, ) and isinstance(text, bytes):
if isinstance(text, bytes):
try:
text = text.decode('ascii')
except UnicodeDecodeError:
Expand Down Expand Up @@ -90,7 +90,7 @@ def checkPath(filename, reporter=None):
try:
with open(filename, 'rb') as f:
codestr = f.read()
except IOError:
except OSError:
msg = sys.exc_info()[1]
reporter.unexpectedError(filename, msg.args[1])
return 1
Expand All @@ -113,7 +113,7 @@ def isPythonFile(filename):
text = f.read(max_bytes)
if not text:
return False
except IOError:
except OSError:
return False

return PYTHON_SHEBANG_REGEX.match(text)
Expand Down