run isort on the entire code base

This is one giant commit, with roughly 2500 lines of changes, but does
result in about 150 LOC removed. That feels like good justifications for
trying to strike a balance between absolute whitespace use and
readability

mesonbuild/_pathlib.py

@@ -20,8 +20,8 @@
 '''
 from __future__ import annotations
 
-import pathlib
 import os
+import pathlib
 import platform
 
 __all__ = [

mesonbuild/_typing.py

@@ -7,6 +7,8 @@
 Holds typing helper classes, such as the ImmutableProtocol classes
 """
 
+from __future__ import annotations
+
 import typing
 
 # We can change this to typing when we require python 3.8

mesonbuild/arglist.py

@@ -4,16 +4,16 @@
 
 from __future__ import annotations
 
-from functools import lru_cache
 import collections
 import enum
 import os
 import re
 import typing as T
+from functools import lru_cache
 
 if T.TYPE_CHECKING:
-    from .linkers.linkers import StaticLinker
     from .compilers import Compiler
+    from .linkers.linkers import StaticLinker
 
 # execinfo is a compiler lib on BSD
 UNIXY_COMPILER_INTERNAL_LIBS = ['m', 'c', 'pthread', 'dl', 'rt', 'execinfo']

mesonbuild/ast/__init__.py

@@ -3,11 +3,13 @@
 
 """Provides interface to maintain `from ast import ...`"""
 
+from __future__ import annotations
+
 from .interpreter import AstInterpreter
-from .introspection import IntrospectionInterpreter, BUILD_TARGET_FUNCTIONS
-from .visitor import AstVisitor
+from .introspection import BUILD_TARGET_FUNCTIONS, IntrospectionInterpreter
 from .postprocess import AstConditionLevel, AstIDGenerator, AstIndentationGenerator
-from .printer import AstPrinter, AstJSONPrinter
+from .printer import AstJSONPrinter, AstPrinter
+from .visitor import AstVisitor
 
 __all__ = [
     'AstConditionLevel',

mesonbuild/ast/interpreter.py

@@ -7,56 +7,24 @@
 import sys
 import typing as T
 
-from .. import mparser, mesonlib
-from .. import environment
-
+from .. import environment, mesonlib, mparser
+from ..interpreter import ArrayHolder, BooleanHolder, DictHolder, IntegerHolder, StringHolder
 from ..interpreterbase import (
-    MesonInterpreterObject,
-    InterpreterBase,
-    InvalidArguments,
-    BreakRequest,
-    ContinueRequest,
-    Disabler,
-    default_resolve_key,
-)
-
-from ..interpreter import (
-    StringHolder,
-    BooleanHolder,
-    IntegerHolder,
-    ArrayHolder,
-    DictHolder,
+    BreakRequest, ContinueRequest, Disabler, InterpreterBase, InvalidArguments,
+    MesonInterpreterObject, default_resolve_key
 )
-
 from ..mparser import (
-    ArgumentNode,
-    ArithmeticNode,
-    ArrayNode,
-    AssignmentNode,
-    BaseNode,
-    ElementaryNode,
-    EmptyNode,
-    IdNode,
-    MethodNode,
-    NotNode,
-    PlusAssignmentNode,
-    TernaryNode,
-    TestCaseClauseNode,
+    ArgumentNode, ArithmeticNode, ArrayNode, AssignmentNode, BaseNode, ElementaryNode, EmptyNode,
+    IdNode, MethodNode, NotNode, PlusAssignmentNode, TernaryNode, TestCaseClauseNode
 )
 
 if T.TYPE_CHECKING:
-    from .visitor import AstVisitor
     from ..interpreter import Interpreter
     from ..interpreterbase import SubProject, TYPE_nkwargs, TYPE_var
     from ..mparser import (
-        AndNode,
-        ComparisonNode,
-        ForeachClauseNode,
-        IfClauseNode,
-        IndexNode,
-        OrNode,
-        UMinusNode,
+        AndNode, ComparisonNode, ForeachClauseNode, IfClauseNode, IndexNode, OrNode, UMinusNode
     )
+    from .visitor import AstVisitor
 
 class DontCareObject(MesonInterpreterObject):
     pass

mesonbuild/ast/introspection.py

@@ -2,18 +2,22 @@
 # Copyright 2018 The Meson development team
 
 from __future__ import annotations
+
 import argparse
 import copy
 import os
 import typing as T
 
-from .. import compilers, environment, mesonlib, optinterpreter
+from .. import compilers
 from .. import coredata as cdata
+from .. import environment, mesonlib, optinterpreter
 from ..build import Executable, Jar, SharedLibrary, SharedModule, StaticLibrary
 from ..compilers import detect_compiler_for
 from ..interpreterbase import InvalidArguments, SubProject
 from ..mesonlib import MachineChoice, OptionKey
-from ..mparser import BaseNode, ArithmeticNode, ArrayNode, ElementaryNode, IdNode, FunctionNode, BaseStringNode
+from ..mparser import (
+    ArithmeticNode, ArrayNode, BaseNode, BaseStringNode, ElementaryNode, FunctionNode, IdNode
+)
 from .interpreter import AstInterpreter
 
 if T.TYPE_CHECKING:

mesonbuild/ast/postprocess.py

@@ -3,9 +3,10 @@
 
 from __future__ import annotations
 
-from .visitor import AstVisitor
 import typing as T
 
+from .visitor import AstVisitor
+
 if T.TYPE_CHECKING:
     from .. import mparser
 

mesonbuild/ast/printer.py

@@ -3,12 +3,12 @@
 
 from __future__ import annotations
 
-from .. import mparser
-from .visitor import AstVisitor
-
-from itertools import zip_longest
 import re
 import typing as T
+from itertools import zip_longest
+
+from .. import mparser
+from .visitor import AstVisitor
 
 arithmic_map = {
     'add': '+',

mesonbuild/backend/backends.py

@@ -3,34 +3,32 @@
 
 from __future__ import annotations
 
-from collections import OrderedDict
-from dataclasses import dataclass, InitVar
-from functools import lru_cache
-from itertools import chain
-from pathlib import Path
 import copy
 import enum
+import hashlib
 import json
 import os
 import pickle
 import re
 import shlex
 import shutil
 import typing as T
-import hashlib
+from collections import OrderedDict
+from dataclasses import InitVar, dataclass
+from functools import lru_cache
+from itertools import chain
+from pathlib import Path
 
-from .. import build
-from .. import dependencies
-from .. import programs
-from .. import mesonlib
-from .. import mlog
+from .. import build, dependencies, mesonlib, mlog, programs
 from ..compilers import LANGUAGES_USING_LDFLAGS, detect
 from ..mesonlib import (
-    File, MachineChoice, MesonException, OrderedSet,
-    ExecutableSerialisation, classify_unity_sources, OptionKey
+    ExecutableSerialisation, File, MachineChoice, MesonException, OptionKey, OrderedSet,
+    classify_unity_sources
 )
 
 if T.TYPE_CHECKING:
+    from typing_extensions import TypedDict
+
     from .._typing import ImmutableListProtocol
     from ..arglist import CompilerArgs
     from ..compilers import Compiler
@@ -39,8 +37,6 @@
     from ..linkers.linkers import StaticLinker
     from ..mesonlib import FileMode, FileOrString
 
-    from typing_extensions import TypedDict
-
     _ALL_SOURCES_TYPE = T.List[T.Union[File, build.CustomTarget, build.CustomTargetIndex, build.GeneratedList]]
 
     class TargetIntrospectionData(TypedDict):

mesonbuild/backend/ninjabackend.py

@@ -3,46 +3,41 @@
 
 from __future__ import annotations
 
-from collections import OrderedDict
-from dataclasses import dataclass
-from enum import Enum, unique
-from functools import lru_cache
-from pathlib import PurePath, Path
-from textwrap import dedent
 import itertools
 import json
 import os
 import pickle
 import re
 import subprocess
 import typing as T
+from collections import OrderedDict
+from dataclasses import dataclass
+from enum import Enum, unique
+from functools import lru_cache
+from pathlib import Path, PurePath
+from textwrap import dedent
 
-from . import backends
-from .. import modules
-from .. import environment, mesonlib
-from .. import build
-from .. import mlog
-from .. import compilers
+from .. import build, compilers, environment, mesonlib, mlog, modules
 from ..arglist import CompilerArgs
+from ..build import GeneratedList, InvalidArguments
 from ..compilers import Compiler
 from ..linkers import ArLikeLinker, RSPFileSyntax
 from ..mesonlib import (
-    File, LibType, MachineChoice, MesonBugException, MesonException, OrderedSet, PerMachine,
-    ProgressBar, quote_arg
+    File, LibType, MachineChoice, MesonBugException, MesonException, OptionKey, OrderedSet,
+    PerMachine, ProgressBar, get_compiler_for_source, has_path_sep, quote_arg
 )
-from ..mesonlib import get_compiler_for_source, has_path_sep, OptionKey
+from . import backends
 from .backends import CleanTrees
-from ..build import GeneratedList, InvalidArguments
 
 if T.TYPE_CHECKING:
     from typing_extensions import Literal
 
     from .._typing import ImmutableListProtocol
     from ..build import ExtractedObjects, LibTypes
-    from ..interpreter import Interpreter
-    from ..linkers.linkers import DynamicLinker, StaticLinker
     from ..compilers.cs import CsCompiler
     from ..compilers.fortran import FortranCompiler
+    from ..interpreter import Interpreter
+    from ..linkers.linkers import DynamicLinker, StaticLinker
 
     CommandArgOrStr = T.List[T.Union['NinjaCommandArg', str]]
     RUST_EDITIONS = Literal['2015', '2018', '2021']

mesonbuild/backend/nonebackend.py

@@ -3,9 +3,9 @@
 
 from __future__ import annotations
 
-from .backends import Backend
 from .. import mlog
 from ..mesonlib import MesonBugException
+from .backends import Backend
 
 
 class NoneBackend(Backend):

mesonbuild/backend/vs2010backend.py

@@ -2,27 +2,25 @@
 # Copyright 2014-2016 The Meson development team
 
 from __future__ import annotations
+
 import copy
 import itertools
 import os
+import re
+import typing as T
+import uuid
 import xml.dom.minidom
 import xml.etree.ElementTree as ET
-import uuid
-import typing as T
-from pathlib import Path, PurePath, PureWindowsPath
-import re
 from collections import Counter
+from pathlib import Path, PurePath, PureWindowsPath
 
-from . import backends
-from .. import build
-from .. import mlog
-from .. import compilers
-from .. import mesonlib
+from .. import build, compilers, coredata, mesonlib, mlog
+from ..environment import Environment, build_filename
 from ..mesonlib import (
-    File, MesonBugException, MesonException, replace_if_different, OptionKey, version_compare, MachineChoice
+    File, MachineChoice, MesonBugException, MesonException, OptionKey, replace_if_different,
+    version_compare
 )
-from ..environment import Environment, build_filename
-from .. import coredata
+from . import backends
 
 if T.TYPE_CHECKING:
     from ..arglist import CompilerArgs

mesonbuild/backend/vs2012backend.py

@@ -5,8 +5,8 @@
 
 import typing as T
 
-from .vs2010backend import Vs2010Backend
 from ..mesonlib import MesonException
+from .vs2010backend import Vs2010Backend
 
 if T.TYPE_CHECKING:
     from ..build import Build

mesonbuild/backend/vs2013backend.py

@@ -3,10 +3,11 @@
 
 from __future__ import annotations
 
-from .vs2010backend import Vs2010Backend
-from ..mesonlib import MesonException
 import typing as T
 
+from ..mesonlib import MesonException
+from .vs2010backend import Vs2010Backend
+
 if T.TYPE_CHECKING:
     from ..build import Build
     from ..interpreter import Interpreter

mesonbuild/backend/vs2015backend.py

@@ -5,8 +5,8 @@
 
 import typing as T
 
-from .vs2010backend import Vs2010Backend
 from ..mesonlib import MesonException
+from .vs2010backend import Vs2010Backend
 
 if T.TYPE_CHECKING:
     from ..build import Build

mesonbuild/backend/vs2017backend.py

@@ -7,8 +7,8 @@
 import typing as T
 import xml.etree.ElementTree as ET
 
-from .vs2010backend import Vs2010Backend
 from ..mesonlib import MesonException
+from .vs2010backend import Vs2010Backend
 
 if T.TYPE_CHECKING:
     from ..build import Build