diff options
author | Anthony Sottile <asottile@umich.edu> | 2022-11-21 14:11:37 -0500 |
---|---|---|
committer | Anthony Sottile <asottile@umich.edu> | 2022-11-21 14:19:58 -0500 |
commit | 798d620cd461a1e7abac1cbba5aab66274aa3229 (patch) | |
tree | d5e703e62ce73668f08edc9007699c986fcc3610 /pycodestyle.py | |
parent | c5308a75adb2c98a00228083ebe7cd87445a8c36 (diff) | |
download | pep8-798d620cd461a1e7abac1cbba5aab66274aa3229.tar.gz |
fix ambiguous identifiers in lambda bodies inside braces
Diffstat (limited to 'pycodestyle.py')
-rwxr-xr-x | pycodestyle.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/pycodestyle.py b/pycodestyle.py index 7ee2375..6dc9142 100755 --- a/pycodestyle.py +++ b/pycodestyle.py @@ -1521,7 +1521,7 @@ def ambiguous_identifier(logical_line, tokens): E742: class I(object): E743: def l(x): """ - is_func_def = False # Set to true if 'def' or 'lambda' is found + func_depth = None # set to brace depth if 'def' or 'lambda' is found seen_colon = False # set to true if we're done with function parameters brace_depth = 0 idents_to_avoid = ('l', 'O', 'I') @@ -1531,8 +1531,13 @@ def ambiguous_identifier(logical_line, tokens): ident = pos = None # find function definitions if prev_text in {'def', 'lambda'}: - is_func_def = True - elif is_func_def and text == ':' and brace_depth == 0: + func_depth = brace_depth + seen_colon = False + elif ( + func_depth is not None and + text == ':' and + brace_depth == func_depth + ): seen_colon = True # update parameter parentheses level if text in '([{': @@ -1552,7 +1557,7 @@ def ambiguous_identifier(logical_line, tokens): pos = start # function / lambda parameter definitions if ( - is_func_def and + func_depth is not None and not seen_colon and index < len(tokens) - 1 and tokens[index + 1][1] in ':,=)' and prev_text in {'lambda', ',', '*', '**', '('} and |