Closes #1200, closes #1202

wemake-services · Mar 12, 2020 · 7d98e40 · 7d98e40
1 parent 4fa9f41
commit 7d98e40
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 7 deletions.
diff --git a/tests/test_visitors/test_ast/test_compares/test_conditionals.py b/tests/test_visitors/test_ast/test_compares/test_conditionals.py
@@ -1,5 +1,6 @@
 import pytest
 
+from wemake_python_styleguide.compat.constants import PY38
 from wemake_python_styleguide.violations.consistency import (
     ConstantConditionViolation,
 )
@@ -31,9 +32,13 @@ def container():
     'variable',
     'variable is True',
     'variable is False',
-    '[1,2,3].size > 3',
+    '[1, 2, 3].size > 3',
     'variable is None',
     'variable is int or not None',
+    pytest.param(
+        '(unique := some()) is True',
+        marks=pytest.mark.skipif(not PY38, reason='walrus appeared in 3.8'),
+    ),
 ])
 def test_valid_conditional(
     assert_errors,
@@ -72,6 +77,10 @@ def test_valid_conditional(
     '{"set"}',
     '("tuple",)',
     '["list"]',
+    pytest.param(
+        '(unique := True)',
+        marks=pytest.mark.skipif(not PY38, reason='walrus appeared in 3.8'),
+    ),
 ])
 def test_useless(
     assert_errors,

diff --git a/...s/test_visitors/test_ast/test_compares/test_constant_compares/test_is_constant_compare.py b/...s/test_visitors/test_ast/test_compares/test_constant_compares/test_is_constant_compare.py
@@ -1,5 +1,6 @@
 import pytest
 
+from wemake_python_styleguide.compat.constants import PY38
 from wemake_python_styleguide.violations.refactoring import (
     FalsyConstantCompareViolation,
     WrongIsCompareViolation,
@@ -8,7 +9,7 @@
     WrongConstantCompareVisitor,
 )
 
-wrong_comparators = (
+wrong_comparators = [
     ('some', '[1, 2]'),
     ('some', '{}'),  # noqa: P103
     ('some', '()'),
@@ -32,7 +33,13 @@
     ('{1, 2}', 'some'),
     ('()', 'some'),
     ('"test"', 'some'),
-)
+]
+
+if PY38:
+    wrong_comparators.extend([
+        ('(x := some())', '"abc"'),
+        ('(x := "abc")', 'some()'),
+    ])
 
 
 @pytest.mark.filterwarnings('ignore::SyntaxWarning')

diff --git a/tests/test_visitors/test_ast/test_compares/test_order.py b/tests/test_visitors/test_ast/test_compares/test_order.py
@@ -24,8 +24,10 @@
     ])
 
 correct_walrus = pytest.param(
-    ('(x := first(1, 2))', '"str"'),
-    marks=pytest.mark.skipif(not PY38, reason='walrus appeared in 3.8'),
+    ['(x := first(1, 2))', '"str"'],
+    marks=pytest.mark.skipif(
+        not PY38, reason='walrus appeared in 3.8',
+    ),
 )
 
 

diff --git a/wemake_python_styleguide/visitors/ast/compares.py b/wemake_python_styleguide/visitors/ast/compares.py
@@ -188,7 +188,9 @@ def _check_is_constant_comprare(
         if not isinstance(op, (ast.Is, ast.IsNot)):
             return
 
-        unwrapped = operators.unwrap_unary_node(comparator)
+        unwrapped = operators.unwrap_unary_node(
+            get_assigned_expr(comparator),
+        )
         if isinstance(unwrapped, self._forbidden_for_is):
             self.add_violation(WrongIsCompareViolation(comparator))
 
@@ -324,7 +326,10 @@ def visit_any_if(self, node: AnyIf) -> None:
         self.generic_visit(node)
 
     def _check_constant_condition(self, node: AnyIf) -> None:
-        real_node = operators.unwrap_unary_node(node.test)
+        real_node = operators.unwrap_unary_node(
+            get_assigned_expr(node.test),
+        )
+
         if isinstance(real_node, self._forbidden_nodes):
             self.add_violation(ConstantConditionViolation(node))