Skip to content

WIP: Fix up E741 for ambiguous identifiers #707

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

Closed
sigmavirus24 wants to merge 1 commit into from
Closed

WIP: Fix up E741 for ambiguous identifiers #707

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions pycodestyle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,11 @@ def lru_cache(maxsize=128): # noqa as it's a fake implementation.
)))
)
DUNDER_REGEX = re.compile(r'^__([^\s]+)__ = ')
AMBIGUOUS_IDENTIFIER_REGEX = re.compile(
r'^\s*(?:for (?P<forident>l|I|O) in [^:]+|'
r'with .+ as (?P<withident>l|I|O)|'
r'(?:async )?def [^(]+\([^)]*\b(?P<defident>l|I|O)\b.*\)):'
)

# Work around Python < 2.6 behaviour, which does not generate NL after
# a comment which is on a line by itself.
Expand Down Expand Up @@ -1303,13 +1308,23 @@ def ambiguous_identifier(logical_line, tokens):

Okay: except AttributeError as o:
Okay: with lock as L:
Okay: foo(l=12)
E741: except AttributeError as O:
E741: with lock as l:
E741: global I
E741: nonlocal l
E741: def foo(l):
E741: for I in range(10,\n step=2):
E741: for O in range(10, step=2):
E742: class I(object):
E743: def l(x):
"""
match = AMBIGUOUS_IDENTIFIER_REGEX.match(logical_line)
if match:
idents = match.groupdict()
ident = (idents['withident'] or idents['forident'] or
idents['defident'])
yield match.start(), "E741 ambiguous variable name '%s'" % ident
idents_to_avoid = ('l', 'O', 'I')
prev_type, prev_text, prev_start, prev_end, __ = tokens[0]
for token_type, text, start, end, line in tokens[1:]:
Expand Down