Merge pull request #866 from asottile/weird-ws

fix weird-ws empty set literals

Author: asottile

pyupgrade/_plugins/set_literals.py

@@ -11,31 +11,19 @@
 from pyupgrade._data import register
 from pyupgrade._data import State
 from pyupgrade._data import TokenFunc
+from pyupgrade._token_helpers import find_closing_bracket
+from pyupgrade._token_helpers import find_op
 from pyupgrade._token_helpers import immediately_paren
-from pyupgrade._token_helpers import is_close
-from pyupgrade._token_helpers import is_open
 from pyupgrade._token_helpers import remove_brace
 from pyupgrade._token_helpers import victims
 
 SET_TRANSFORM = (ast.List, ast.ListComp, ast.GeneratorExp, ast.Tuple)
 
 
 def _fix_set_empty_literal(i: int, tokens: list[Token]) -> None:
-    # TODO: this could be implemented with a little extra logic
-    if not immediately_paren('set', tokens, i):
-        return
-
-    j = i + 2
-    depth = 1
-    while depth:
-        if is_open(tokens[j]):
-            depth += 1
-        elif is_close(tokens[j]):
-            depth -= 1
-        j += 1
-
-    # Remove the inner tokens
-    del tokens[i + 2:j - 1]
+    i = find_op(tokens, i, '(')
+    j = find_closing_bracket(tokens, i)
+    del tokens[i + 1:j]
 
 
 def _fix_set_literal(i: int, tokens: list[Token], *, arg: ast.expr) -> None:

tests/features/set_literals_test.py

@@ -13,7 +13,7 @@
         'set()',
         # Don't touch weird looking function calls -- use autopep8 or such
         # first
-        'set (())', 'set ((1, 2))',
+        'set ((1, 2))',
     ),
 )
 def test_fix_sets_noop(s):
@@ -26,6 +26,7 @@ def test_fix_sets_noop(s):
         # Take a set literal with an empty tuple / list and remove the arg
         ('set(())', 'set()'),
         ('set([])', 'set()'),
+        pytest.param('set (())', 'set ()', id='empty, weird ws'),
         # Remove spaces in empty set literals
         ('set(( ))', 'set()'),
         # Some "normal" test cases