Closes #1684

tests/test_visitors/test_ast/test_builtins/test_assign/test_unpacking_rules.py

@@ -89,7 +89,6 @@ def wrapper():
     tuple_assignment1,
     tuple_assignment2,
     spread_assignment1,
-    spread_assignment2,
     for_assignment,
     for_unpacking1,
     for_unpacking2,
@@ -101,6 +100,10 @@ def wrapper():
     with_unpacking1,
     with_unpacking2,
 ])
+@pytest.mark.parametrize('definition', [
+    'some_name',
+    '(a, b)',  # tuple
+])
 @pytest.mark.parametrize('target', [
     '(1, 2)',
     '[1, 2]',
@@ -109,12 +112,41 @@ def test_correct_unpacking(
     assert_errors,
     parse_ast_tree,
     code,
+    definition,
+    target,
+    default_options,
+    mode,
+):
+    """Testing that correct assignments work."""
+    tree = parse_ast_tree(mode(code.format(definition, target)))
+
+    visitor = WrongAssignmentVisitor(default_options, tree=tree)
+    visitor.run()
+
+    assert_errors(visitor, [])
+
+
+@pytest.mark.parametrize('code', [
+    spread_assignment2,
+])
+@pytest.mark.parametrize('definition', [
+    'some_name',
+])
+@pytest.mark.parametrize('target', [
+    '(1, 2)',
+    '[1, 2]',
+])
+def test_correct_spread_unpacking(
+    assert_errors,
+    parse_ast_tree,
+    code,
+    definition,
     target,
     default_options,
     mode,
 ):
     """Testing that correct assignments work."""
-    tree = parse_ast_tree(mode(code.format('some_name', target)))
+    tree = parse_ast_tree(mode(code.format(definition, target)))
 
     visitor = WrongAssignmentVisitor(default_options, tree=tree)
     visitor.run()

tests/test_visitors/test_ast/test_loops/test_comprehensions/test_variable_definition_comprehensions.py

@@ -69,6 +69,9 @@ def test_wrong_definitions_in_comprehension(
     '(y, xy)',
     '(first, *star)',
     '(first, second, *star)',
+    # regression 1684
+    'first, (second, third)',
+    '(first, second), third',
 ])
 def test_comprehension_without_bad_definitions(
     assert_errors,

wemake_python_styleguide/logic/tree/variables.py

@@ -16,12 +16,22 @@ def is_valid_block_variable_definition(node: _VarDefinition) -> bool:
     """Is used to check either block variables are correctly defined."""
     if isinstance(node, ast.Tuple):
         return all(
-            _is_valid_single(var_definition)
+            is_valid_block_variable_definition(var_definition)
             for var_definition in node.elts
         )
     return _is_valid_single(node)
 
 
+def is_valid_unpacking_target(target: ast.expr) -> bool:
+    """Checks if unpacking target is correct."""
+    if isinstance(target, ast.Tuple):
+        return all(
+            _is_valid_single(element) is not None
+            for element in target.elts
+        )
+    return _is_valid_single(target)
+
+
 def _is_valid_single(node: _VarDefinition) -> bool:
     return (
         isinstance(node, ast.Name) or

wemake_python_styleguide/visitors/ast/builtins.py

@@ -31,6 +31,7 @@
     functions,
     operators,
     strings,
+    variables,
 )
 from wemake_python_styleguide.types import (
     AnyChainable,
@@ -420,18 +421,15 @@ def _check_assign_targets(self, node: ast.Assign) -> None:
     def _check_unpacking_targets(
         self,
         node: ast.AST,
-        targets: Iterable[ast.AST],
+        targets: List[ast.expr],
     ) -> None:
-        targets = tuple(targets)
-
         if len(targets) == 1:
             self.add_violation(
                 best_practices.SingleElementDestructuringViolation(node),
             )
 
         for target in targets:
-            target_name = extract_name(target)
-            if target_name is None:  # it means, that non name node was used
+            if not variables.is_valid_unpacking_target(target):
                 self.add_violation(
                     best_practices.WrongUnpackingViolation(node),
                 )

wemake_python_styleguide/visitors/ast/keywords.py

@@ -11,7 +11,7 @@
 from wemake_python_styleguide.logic import walk
 from wemake_python_styleguide.logic.naming import name_nodes
 from wemake_python_styleguide.logic.nodes import get_parent
-from wemake_python_styleguide.logic.tree import keywords, operators
+from wemake_python_styleguide.logic.tree import keywords, operators, variables
 from wemake_python_styleguide.logic.tree.exceptions import get_exception_name
 from wemake_python_styleguide.logic.tree.variables import (
     is_valid_block_variable_definition,