Add back a few lint checks now that flake8 is better (#6927)

asottile · JukkaL · commit 2ab14cc99fef · 2019-06-03T11:46:03.000+01:00
diff --git a/conftest.py b/conftest.py
@@ -1,7 +1,5 @@
 import os.path
 
-import pytest
-
 pytest_plugins = [
     'mypy.test.data',
 ]
diff --git a/mypy/build.py b/mypy/build.py
@@ -499,7 +499,7 @@ def __init__(self, data_dir: str,
                  search_paths: SearchPaths,
                  ignore_prefix: str,
                  source_set: BuildSourceSet,
-                 reports: Optional['Reports'],
+                 reports: 'Optional[Reports]',
                  options: Options,
                  version_id: str,
                  plugin: Plugin,
diff --git a/mypy/checkexpr.py b/mypy/checkexpr.py
@@ -3,8 +3,7 @@
 from collections import OrderedDict
 from contextlib import contextmanager
 from typing import (
-    cast, Dict, Set, List, Tuple, Callable, Union, Optional, Iterable,
-    Sequence, Iterator
+    cast, Dict, Set, List, Tuple, Callable, Union, Optional, Sequence, Iterator
 )
 MYPY = False
 if MYPY:
diff --git a/mypy/fastparse.py b/mypy/fastparse.py
@@ -105,7 +105,7 @@ def ast3_parse(source: Union[str, bytes], filename: str, mode: str,
         Constant = Any
 except ImportError:
     try:
-        from typed_ast import ast35  # type: ignore
+        from typed_ast import ast35  # type: ignore  # noqa: F401
     except ImportError:
         print('The typed_ast package is not installed.\n'
               'You can install it with `python3 -m pip install typed-ast`.',
diff --git a/mypy/fastparse2.py b/mypy/fastparse2.py
@@ -62,7 +62,7 @@
     from mypy.fastparse import ast3, ast3_parse
 except ImportError:
     try:
-        from typed_ast import ast35  # type: ignore
+        from typed_ast import ast35  # type: ignore  # noqa: F401
     except ImportError:
         print('The typed_ast package is not installed.\n'
               'You can install it with `python3 -m pip install typed-ast`.',
diff --git a/mypy/messages.py b/mypy/messages.py
@@ -294,7 +294,7 @@ def format_bare(self, typ: Type, verbosity: int = 0) -> str:
                         arg_strings.append(
                             self.format_bare(
                                 arg_type,
-                                verbosity = max(verbosity - 1, 0)))
+                                verbosity=max(verbosity - 1, 0)))
                     else:
                         constructor = ARG_CONSTRUCTOR_NAMES[arg_kind]
                         if arg_kind in (ARG_STAR, ARG_STAR2) or arg_name is None:
diff --git a/mypy/metastore.py b/mypy/metastore.py
@@ -15,7 +15,7 @@
 import time
 
 from abc import abstractmethod
-from typing import Dict, List, Set, Iterable, Any, Optional
+from typing import List, Iterable, Any, Optional
 
 
 class MetadataStore:
diff --git a/mypy/newsemanal/semanal_enum.py b/mypy/newsemanal/semanal_enum.py
@@ -7,7 +7,7 @@
 
 from mypy.nodes import (
     Expression, Context, TypeInfo, AssignmentStmt, NameExpr, CallExpr, RefExpr, StrExpr,
-    UnicodeExpr, TupleExpr, ListExpr, DictExpr, Var, SymbolTableNode, GDEF, MDEF, ARG_POS,
+    UnicodeExpr, TupleExpr, ListExpr, DictExpr, Var, SymbolTableNode, MDEF, ARG_POS,
     EnumCallExpr
 )
 from mypy.newsemanal.semanal_shared import SemanticAnalyzerInterface
diff --git a/mypy/newsemanal/semanal_main.py b/mypy/newsemanal/semanal_main.py
@@ -28,7 +28,7 @@
 from typing import List, Tuple, Optional, Union, Callable, Iterator
 
 from mypy.nodes import (
-    MypyFile, TypeInfo, FuncDef, Decorator, OverloadedFuncDef, SymbolTableNode, Var, ClassDef
+    MypyFile, TypeInfo, FuncDef, Decorator, OverloadedFuncDef, Var
 )
 from mypy.newsemanal.semanal_typeargs import TypeArgumentAnalyzer
 from mypy.state import strict_optional_set
diff --git a/mypy/newsemanal/semanal_namedtuple.py b/mypy/newsemanal/semanal_namedtuple.py
@@ -16,7 +16,7 @@
     Var, EllipsisExpr, Argument, StrExpr, BytesExpr, UnicodeExpr, ExpressionStmt, NameExpr,
     AssignmentStmt, PassStmt, Decorator, FuncBase, ClassDef, Expression, RefExpr, TypeInfo,
     NamedTupleExpr, CallExpr, Context, TupleExpr, ListExpr, SymbolTableNode, FuncDef, Block,
-    TempNode, SymbolTable, TypeVarExpr, ARG_POS, ARG_NAMED_OPT, ARG_OPT, MDEF, GDEF
+    TempNode, SymbolTable, TypeVarExpr, ARG_POS, ARG_NAMED_OPT, ARG_OPT, MDEF
 )
 from mypy.options import Options
 from mypy.exprtotype import expr_to_unanalyzed_type, TypeTranslationError
diff --git a/mypy/newsemanal/typeanal.py b/mypy/newsemanal/typeanal.py
@@ -1,7 +1,7 @@
 """Semantic analysis of types"""
 
 from collections import OrderedDict
-from typing import Callable, List, Optional, Set, Tuple, Iterator, TypeVar, Iterable, Dict
+from typing import Callable, List, Optional, Set, Tuple, Iterator, TypeVar, Iterable
 
 from itertools import chain
 
@@ -13,16 +13,16 @@
 from mypy.options import Options
 from mypy.types import (
     Type, UnboundType, TypeVarType, TupleType, TypedDictType, UnionType, Instance, AnyType,
-    CallableType, NoneType, DeletedType, TypeList, TypeVarDef, TypeVisitor, SyntheticTypeVisitor,
+    CallableType, NoneType, DeletedType, TypeList, TypeVarDef, SyntheticTypeVisitor,
     StarType, PartialType, EllipsisType, UninhabitedType, TypeType, get_typ_args, set_typ_args,
-    CallableArgument, get_type_vars, TypeQuery, union_items, TypeOfAny, ForwardRef, Overloaded,
+    CallableArgument, get_type_vars, TypeQuery, union_items, TypeOfAny, ForwardRef,
     LiteralType, RawExpressionType, PlaceholderType
 )
 
 from mypy.nodes import (
     TypeInfo, Context, SymbolTableNode, Var, Expression,
-    IndexExpr, RefExpr, nongen_builtins, check_arg_names, check_arg_kinds, ARG_POS, ARG_NAMED,
-    ARG_OPT, ARG_NAMED_OPT, ARG_STAR, ARG_STAR2, TypeVarExpr, CallExpr, NameExpr,
+    nongen_builtins, check_arg_names, check_arg_kinds, ARG_POS, ARG_NAMED,
+    ARG_OPT, ARG_NAMED_OPT, ARG_STAR, ARG_STAR2, TypeVarExpr,
     TypeAlias, PlaceholderNode
 )
 from mypy.typetraverser import TypeTraverserVisitor
diff --git a/mypy/renaming.py b/mypy/renaming.py
@@ -1,7 +1,7 @@
-from typing import Dict, List, Set
+from typing import Dict, List
 
 from mypy.nodes import (
-    Block, AssignmentStmt, NameExpr, MypyFile, FuncDef, Lvalue, ListExpr, TupleExpr, TempNode,
+    Block, AssignmentStmt, NameExpr, MypyFile, FuncDef, Lvalue, ListExpr, TupleExpr,
     WhileStmt, ForStmt, BreakStmt, ContinueStmt, TryStmt, WithStmt, StarExpr, ImportFrom,
     MemberExpr, IndexExpr, Import, ClassDef
 )
diff --git a/mypy/report.py b/mypy/report.py
@@ -32,7 +32,7 @@
 try:
     # mypyc doesn't properly handle import from of submodules that we
     # don't have stubs for, hence the hacky double import
-    import lxml.etree  # type: ignore
+    import lxml.etree  # type: ignore  # noqa: F401
     from lxml import etree  # type: ignore
     LXML_INSTALLED = True
 except ImportError:
diff --git a/mypy/semanal.py b/mypy/semanal.py
@@ -55,7 +55,7 @@
     SetComprehension, DictionaryComprehension, TypeAlias, TypeAliasExpr,
     YieldExpr, ExecStmt, BackquoteExpr, ImportBase, AwaitExpr,
     IntExpr, FloatExpr, UnicodeExpr, TempNode, ImportedName, OverloadPart,
-    COVARIANT, CONTRAVARIANT, INVARIANT, UNBOUND_IMPORTED, LITERAL_YES, nongen_builtins,
+    COVARIANT, CONTRAVARIANT, INVARIANT, UNBOUND_IMPORTED, nongen_builtins,
     get_member_expr_fullname, REVEAL_TYPE, REVEAL_LOCALS, is_final_node
 )
 from mypy.tvar_scope import TypeVarScope
@@ -65,7 +65,7 @@
 from mypy.messages import best_matches, MessageBuilder, pretty_or
 from mypy import message_registry
 from mypy.types import (
-    FunctionLike, UnboundType, TypeVarDef, TupleType, UnionType, StarType, function_type,
+    FunctionLike, UnboundType, TypeVarDef, TupleType, StarType, function_type,
     CallableType, Overloaded, Instance, Type, AnyType, LiteralType, LiteralValue,
     TypeTranslator, TypeOfAny, TypeType, NoneType,
 )
diff --git a/mypy/semanal_namedtuple.py b/mypy/semanal_namedtuple.py
@@ -6,7 +6,7 @@
 from typing import Tuple, List, Dict, Mapping, Optional, Union, cast
 
 from mypy.types import (
-    Type, TupleType, NoneType, AnyType, TypeOfAny, TypeVarType, TypeVarDef, CallableType, TypeType
+    Type, TupleType, AnyType, TypeOfAny, TypeVarType, TypeVarDef, CallableType, TypeType
 )
 from mypy.semanal_shared import SemanticAnalyzerInterface, set_callable_name, PRIORITY_FALLBACKS
 from mypy.nodes import (
diff --git a/mypy/server/aststripnew.py b/mypy/server/aststripnew.py
@@ -4,7 +4,7 @@
 """
 
 import contextlib
-from typing import Union, Iterator, Optional, List, Callable, Dict, Tuple
+from typing import Union, Iterator, Optional, Dict, Tuple
 
 from mypy.nodes import (
     FuncDef, NameExpr, MemberExpr, RefExpr, MypyFile, ClassDef, AssignmentStmt,
diff --git a/mypy/server/update.py b/mypy/server/update.py
@@ -114,8 +114,7 @@
 
 import time
 from typing import (
-    Dict, List, Set, Tuple, Iterable, Union, Optional, NamedTuple, Callable,
-    Sequence
+    Dict, List, Set, Tuple, Union, Optional, NamedTuple, Callable, Sequence
 )
 
 from mypy.build import (
diff --git a/mypy/stubgen.py b/mypy/stubgen.py
@@ -53,7 +53,7 @@
 from collections import defaultdict
 
 from typing import (
-    Any, List, Dict, Tuple, Iterable, Mapping, Optional, Set, cast
+    List, Dict, Tuple, Iterable, Mapping, Optional, Set, cast
 )
 
 import mypy.build
@@ -67,7 +67,7 @@
     Expression, IntExpr, UnaryExpr, StrExpr, BytesExpr, NameExpr, FloatExpr, MemberExpr,
     TupleExpr, ListExpr, ComparisonExpr, CallExpr, IndexExpr, EllipsisExpr,
     ClassDef, MypyFile, Decorator, AssignmentStmt, TypeInfo,
-    IfStmt, ReturnStmt, ImportAll, ImportFrom, Import, FuncDef, FuncBase, TempNode,
+    IfStmt, ImportAll, ImportFrom, Import, FuncDef, FuncBase, TempNode,
     ARG_POS, ARG_STAR, ARG_STAR2, ARG_NAMED, ARG_NAMED_OPT
 )
 from mypy.stubgenc import generate_stub_for_c_module
diff --git a/mypy/test/helpers.py b/mypy/test/helpers.py
@@ -8,14 +8,13 @@
 from typing import List, Iterable, Dict, Tuple, Callable, Any, Optional, Iterator
 
 from mypy import defaults
-from mypy.test.config import test_temp_dir
 import mypy.api as api
 
 import pytest  # type: ignore  # no pytest in typeshed
 
 # Exporting Suite as alias to TestCase for backwards compatibility
 # TODO: avoid aliasing - import and subclass TestCase directly
-from unittest import TestCase as Suite
+from unittest import TestCase as Suite  # noqa: F401 (re-exporting)
 
 from mypy.main import process_options
 from mypy.options import Options
diff --git a/mypy/test/testargs.py b/mypy/test/testargs.py
@@ -7,12 +7,9 @@
 import argparse
 import sys
 
-import pytest  # type: ignore
-
 from mypy.test.helpers import Suite, assert_equal
 from mypy.options import Options
-from mypy.main import (process_options, PythonExecutableInferenceError,
-                       infer_python_executable)
+from mypy.main import process_options, infer_python_executable
 
 
 class ArgSuite(Suite):
diff --git a/mypy/test/testgraph.py b/mypy/test/testgraph.py
@@ -3,8 +3,6 @@
 import sys
 from typing import AbstractSet, Dict, Set, List
 
-from io import StringIO
-
 from mypy.test.helpers import assert_equal, Suite
 from mypy.build import BuildManager, State, BuildSourceSet
 from mypy.modulefinder import SearchPaths
diff --git a/mypy/test/teststubgen.py b/mypy/test/teststubgen.py
@@ -1,4 +1,3 @@
-import glob
 import io
 import os.path
 import shutil
diff --git a/mypy/test/testtransform.py b/mypy/test/testtransform.py
@@ -5,13 +5,12 @@
 from mypy import build
 from mypy.modulefinder import BuildSource
 from mypy.test.helpers import (
-    assert_string_arrays_equal, testfile_pyversion, normalize_error_messages, parse_options
+    assert_string_arrays_equal, normalize_error_messages, parse_options
 )
 from mypy.test.data import DataDrivenTestCase, DataSuite
 from mypy.test.config import test_temp_dir
 from mypy.test.visitors import TypeAssertTransformVisitor
 from mypy.errors import CompileError
-from mypy.options import Options
 
 
 class TransformSuite(DataSuite):
diff --git a/mypy/test/testtypes.py b/mypy/test/testtypes.py
@@ -1,6 +1,6 @@
 """Test cases for mypy types and type operations."""
 
-from typing import List, Tuple, cast
+from typing import List, Tuple
 
 from mypy.test.helpers import Suite, assert_equal, assert_true, assert_false, assert_type, skip
 from mypy.erasetype import erase_type
diff --git a/setup.cfg b/setup.cfg
@@ -31,20 +31,16 @@ exclude =
   .Python
 
 # Things to ignore:
-#   E251: spaces around default arg value (against our style)
 #   E128: continuation line under-indented (too noisy)
-#   F401: unused identifiers (useless, as it doesn't see inside # type: comments)
 #   W601: has_key() deprecated (false positives)
 #   E701: multiple statements on one line (colon) (we use this for classes with empty body)
-#   W503: line break before binary operator
-#   W504: line break after binary operator
 #   E704: multiple statements on one line (def)
 #   E402: module level import not at top of file
 #   B3??: Python 3 compatibility warnings
 #   B006: use of mutable defaults in function signatures
 #   B007: Loop control variable not used within the loop body.
 #   B011: Don't use assert False
-ignore = E251,E128,F401,W601,E701,W503,W504,E704,E402,B3,B006,B007,B011
+extend-ignore = E128,W601,E701,E704,E402,B3,B006,B007,B011
 
 [coverage:run]
 branch = true
diff --git a/test-requirements.txt b/test-requirements.txt
@@ -1,5 +1,5 @@
 attrs>=18.0
-flake8
+flake8>=3.7
 flake8-bugbear; python_version >= '3.5'
 flake8-pyi; python_version >= '3.6'
 lxml==4.2.4
diff --git a/tox.ini b/tox.ini
@@ -44,7 +44,7 @@ parallel_show_output = True
 [testenv:lint]
 description = check the code style
 basepython = python3.7
-commands = flake8 -j0 {posargs}
+commands = flake8 {posargs}
 
 [testenv:type]
 description = type check ourselves

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`import os.path`
`2`	`2`
`3`		`-import pytest`
`4`		`-`
`5`	`3`	`pytest_plugins = [`
`6`	`4`	`'mypy.test.data',`
`7`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`from mypy.nodes import (`
`9`	`9`	`Expression, Context, TypeInfo, AssignmentStmt, NameExpr, CallExpr, RefExpr, StrExpr,`
`10`		`- UnicodeExpr, TupleExpr, ListExpr, DictExpr, Var, SymbolTableNode, GDEF, MDEF, ARG_POS,`
	`10`	`+ UnicodeExpr, TupleExpr, ListExpr, DictExpr, Var, SymbolTableNode, MDEF, ARG_POS,`
`11`	`11`	`EnumCallExpr`
`12`	`12`	`)`
`13`	`13`	`from mypy.newsemanal.semanal_shared import SemanticAnalyzerInterface`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`from typing import List, Tuple, Optional, Union, Callable, Iterator`
`29`	`29`
`30`	`30`	`from mypy.nodes import (`
`31`		`- MypyFile, TypeInfo, FuncDef, Decorator, OverloadedFuncDef, SymbolTableNode, Var, ClassDef`
	`31`	`+ MypyFile, TypeInfo, FuncDef, Decorator, OverloadedFuncDef, Var`
`32`	`32`	`)`
`33`	`33`	`from mypy.newsemanal.semanal_typeargs import TypeArgumentAnalyzer`
`34`	`34`	`from mypy.state import strict_optional_set`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`Var, EllipsisExpr, Argument, StrExpr, BytesExpr, UnicodeExpr, ExpressionStmt, NameExpr,`
`17`	`17`	`AssignmentStmt, PassStmt, Decorator, FuncBase, ClassDef, Expression, RefExpr, TypeInfo,`
`18`	`18`	`NamedTupleExpr, CallExpr, Context, TupleExpr, ListExpr, SymbolTableNode, FuncDef, Block,`
`19`		`- TempNode, SymbolTable, TypeVarExpr, ARG_POS, ARG_NAMED_OPT, ARG_OPT, MDEF, GDEF`
	`19`	`+ TempNode, SymbolTable, TypeVarExpr, ARG_POS, ARG_NAMED_OPT, ARG_OPT, MDEF`
`20`	`20`	`)`
`21`	`21`	`from mypy.options import Options`
`22`	`22`	`from mypy.exprtotype import expr_to_unanalyzed_type, TypeTranslationError`