From 0af9b37cd91c00068670af6dd5c21d064675c718 Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Mon, 21 Nov 2022 14:11:37 -0500 Subject: [PATCH] fix ambiguous identifiers in lambda bodies inside braces --- pycodestyle.py | 12 ++++++++---- testsuite/E74.py | 4 ++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pycodestyle.py b/pycodestyle.py index 7ee2375a..8fb2fa1f 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,12 @@ 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 + 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 +1556,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 diff --git a/testsuite/E74.py b/testsuite/E74.py index 93d6c131..5885242a 100644 --- a/testsuite/E74.py +++ b/testsuite/E74.py @@ -2,3 +2,7 @@ lambda l: dict(zip(l, range(len(l)))) #: E741:1:7 E704:1:1 def f(l): print(l, l, l) +#: E741:2:12 +x = ( + lambda l: dict(zip(l, range(len(l)))), +)