Merge pull request #128 from jamescooke/unpick-py35-fixes

Unpick Python 3.5 fixes

src/flake8_aaa/helpers.py

@@ -91,14 +91,9 @@ def node_is_result_assignment(node: ast.AST) -> bool:
     if isinstance(node, ast.Assign):
         return len(node.targets) == 1 and isinstance(node.targets[0], ast.Name) and node.targets[0].id == "result"
 
-    # py35 has no Annotated Assignment, so work around it...
-    try:
-        ann_assign_cls = getattr(ast, 'AnnAssign')
-    except AttributeError:
-        return False
-
-    if isinstance(node, ann_assign_cls):
+    if isinstance(node, ast.AnnAssign):
         return node.target.id == "result"  # type: ignore
+
     return False
 
 
@@ -209,10 +204,6 @@ def filter_assert_nodes(nodes: List[ast.stmt], min_line_number: int) -> List[ast
     return [node for node in nodes if node.lineno > min_line_number]
 
 
-# py35 sees this as a const
-JoinedStrType = getattr(ast, 'JoinedStr', None)
-
-
 def find_stringy_lines(tree: ast.AST, first_line_no: int) -> Set[int]:
     """
     Finds all lines that contain a string in a tree, usually a function. These
@@ -226,7 +217,7 @@ def find_stringy_lines(tree: ast.AST, first_line_no: int) -> Set[int]:
     """
     str_footprints = set()
     for node in ast.walk(tree):
-        if isinstance(node, ast.Str) or (JoinedStrType is not None and isinstance(node, JoinedStrType)):
+        if isinstance(node, ast.Str) or isinstance(node, ast.JoinedStr):
             try:
                 str_footprints.update(build_footprint(node, first_line_no))
             except AttributeError:

tests/act_node/test_build.py

@@ -47,6 +47,8 @@ def test_unittest_raises_block(first_node_with_tokens):
         ('result = do_thing()', ActNodeType.result_assignment),
         ('with pytest.raises(Exception):\n    do_thing()', ActNodeType.pytest_raises),
         ('data[new_key] = value  # act', ActNodeType.marked_act),
+        ('result: Thing = do_thing()', ActNodeType.result_assignment),
+        ('result: List[int] = do_thing()', ActNodeType.result_assignment),
     ]
 )
 def test(expected_type, first_node_with_tokens):

tests/helpers/test_build_footprint.py

@@ -34,3 +34,25 @@ def test(first_node_with_tokens, first_line_no, expected_lines):
     result = build_footprint(first_test_node, first_line_no)
 
     assert result == expected_lines
+
+
+@pytest.mark.parametrize(
+    'code_str, first_line_no, expected_lines', [
+        (
+            '''
+def test_f_string_check(version):  # 0
+    result = do(
+        f"""/path/to/folder/
+
+        {version}/thing.py""",  # 4
+    )
+''', 2, set([2, 3, 4])
+        ),
+    ]
+)
+def test_f_string(first_node_with_tokens, first_line_no, expected_lines):
+    f_string_node = first_node_with_tokens.body[0].value.args[0]
+
+    result = build_footprint(f_string_node, first_line_no)
+
+    assert result == expected_lines

tests/helpers/test_find_stringy_lines.py

@@ -48,6 +48,18 @@ def test_other(m):  # 3
     """  # 16
 ''', 2, set([0, 1, 2, 4, 5, 6, 7, 8, 13, 14, 15, 16])
         ),
+        (
+            '''
+def test_f_string_check(version):  # 0
+    result = do(
+        f"""/path/to/folder/
+
+        {version}/thing.py""",  # 4
+    )
+
+    assert result is True
+''', 2, set([2, 3, 4])
+        ),
     ]
 )
 def test(first_node_with_tokens, offset, expected_lines):

tests/helpers/test_get_first_token.py

@@ -25,6 +25,9 @@ def test(first_node_with_tokens):
         ('''
 r'hello world'
 ''', 'r\'hello world\''),
+        ('''
+f"hello world"
+''', 'f"hello world"'),
     ]
 )
 def test_strings(first_node_with_tokens, expected):

tests/helpers/test_node_is_result_assignment.py

@@ -13,6 +13,9 @@
         ('result[0] = 0', False),
         ('result += 1', False),
         ('result -= 1', False),
+        ('result: int = 1', True),
+        ('result: List[int] = [1]', True),
+        ('xresult: int = 1', False),
     ],
 )
 def test_no(first_node_with_tokens, expected_result):

tox.ini

@@ -51,7 +51,6 @@ commands =
     lint: make lint
     lintexamples: make lintexamples
     test: pytest {posargs:tests}
-    test: pytest tests_py36_plus
 skip_install =
     lint: true
     lintexamples: true