Bug 1811850 - [lint] Fix ruff errors resulting from new configuration, r=webdriver-reviewers,perftest-reviewers,whimboo,sparky,firefox-build-system-reviewers,ahochheiden

# ignore-this-changeset

Differential Revision: https://phabricator.services.mozilla.com/D172359

js/src/gdb/mozilla/ExecutableAllocator.py

@@ -9,6 +9,7 @@ allocated by the Jits.
 """
 
 import gdb
+
 import mozilla.prettyprinters
 from mozilla.prettyprinters import pretty_printer, ptr_pretty_printer
 

js/src/gdb/mozilla/GCCellPtr.py

@@ -5,6 +5,7 @@
 # Pretty-printers for GCCellPtr values.
 
 import gdb
+
 import mozilla.prettyprinters
 from mozilla.prettyprinters import pretty_printer
 

js/src/gdb/mozilla/Interpreter.py

@@ -5,6 +5,7 @@
 # Pretty-printers for InterpreterRegs.
 
 import gdb
+
 import mozilla.prettyprinters as prettyprinters
 
 prettyprinters.clear_module_printers(__name__)

js/src/gdb/mozilla/IonGraph.py

@@ -17,6 +17,7 @@ import tempfile
 import time
 
 import gdb
+
 import mozilla.prettyprinters
 from mozilla.prettyprinters import pretty_printer
 

js/src/gdb/mozilla/JSObject.py

@@ -7,6 +7,7 @@
 import re
 
 import gdb
+
 import mozilla.prettyprinters as prettyprinters
 from mozilla.CellHeader import get_header_ptr
 from mozilla.jsval import JSValue

js/src/gdb/mozilla/JSString.py

@@ -5,6 +5,7 @@
 # Pretty-printers for SpiderMonkey strings.
 
 import gdb
+
 import mozilla.prettyprinters
 from mozilla.CellHeader import get_header_length_and_flags
 from mozilla.prettyprinters import ptr_pretty_printer

js/src/gdb/mozilla/autoload.py

@@ -8,6 +8,7 @@ print("Loading JavaScript value pretty-printers; see js/src/gdb/README.")
 print("If they cause trouble, type: disable pretty-printer .* SpiderMonkey")
 
 import gdb.printing
+
 import mozilla.ExecutableAllocator
 
 # Import the pretty-printer modules. As a side effect, loading these

js/src/gdb/mozilla/jsop.py

@@ -6,6 +6,7 @@
 
 import gdb
 import gdb.types
+
 import mozilla.prettyprinters
 from mozilla.prettyprinters import pretty_printer, ptr_pretty_printer
 

js/src/gdb/mozilla/jsval.py

@@ -8,6 +8,7 @@ import struct
 
 import gdb
 import gdb.types
+
 import mozilla.prettyprinters
 from mozilla.prettyprinters import pretty_printer
 

js/src/gdb/mozilla/unwind.py

@@ -9,6 +9,7 @@ import platform
 import gdb
 import gdb.types
 from gdb.FrameDecorator import FrameDecorator
+
 from mozilla.JSObject import get_function_name, get_function_script
 from mozilla.prettyprinters import TypeCache
 

python/gdbpp/gdbpp/enumset.py

@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import gdb
+
 from gdbpp import GeckoPrettyPrinter
 
 

python/gdbpp/gdbpp/owningthread.py

@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import gdb
+
 from gdbpp import GeckoPrettyPrinter
 
 

python/gdbpp/gdbpp/thashtable.py

@@ -5,6 +5,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import gdb
+
 from gdbpp import GeckoPrettyPrinter
 
 

python/mach/mach/test/test_site.py

@@ -5,7 +5,7 @@
 import os
 from unittest import mock
 
-import pytest as pytest
+import pytest
 from buildconfig import topsrcdir
 from mozunit import main
 

python/mozbuild/.ruff.toml

@@ -3,6 +3,7 @@ src = [
     # Treat direct imports in the test modules as first party.
     "mozpack/test",
     "mozbuild/test",
+]
 
 [isort]
 known-first-party = ["mozbuild"]

python/mozbuild/mozbuild/compilation/codecomplete.py

@@ -9,6 +9,7 @@ from mach.decorators import Command, CommandArgument
 from mozbuild.shellutil import quote as shell_quote
 from mozbuild.shellutil import split as shell_split
 
+
 # Instropection commands.
 
 

python/mozbuild/mozbuild/configure/options.py

@@ -147,7 +147,7 @@ class NegativeOptionValue(OptionValue):
         return super(NegativeOptionValue, cls).__new__(cls, origin=origin)
 
     def __init__(self, origin="unknown"):
-        return super(NegativeOptionValue, self).__init__(origin=origin)
+        super(NegativeOptionValue, self).__init__(origin=origin)
 
 
 class InvalidOptionError(Exception):

python/mozbuild/mozbuild/mach_commands.py

@@ -32,9 +32,12 @@ from mach.decorators import (
 from voluptuous import All, Boolean, Required, Schema
 
 import mozbuild.settings  # noqa need @SettingsProvider hook to execute
-from mozbuild.base import BinaryNotFoundException, BuildEnvironmentNotFoundException
+from mozbuild.base import (
+    BinaryNotFoundException,
+    BuildEnvironmentNotFoundException,
+    MozbuildObject,
+)
 from mozbuild.base import MachCommandConditions as conditions
-from mozbuild.base import MozbuildObject
 from mozbuild.util import MOZBUILD_METRICS_PATH
 
 here = os.path.abspath(os.path.dirname(__file__))

python/mozbuild/mozbuild/test/configure/test_checks_configure.py

@@ -8,11 +8,11 @@ import textwrap
 import unittest
 
 from buildconfig import topsrcdir
-from common import ConfigureTestSandbox, ensure_exe_extension, fake_short_path
 from mozpack import path as mozpath
 from mozunit import MockedOpen, main
 from six import StringIO
 
+from common import ConfigureTestSandbox, ensure_exe_extension, fake_short_path
 from mozbuild.configure import ConfigureError, ConfigureSandbox
 from mozbuild.shellutil import quote as shell_quote
 from mozbuild.util import exec_

python/mozbuild/mozbuild/test/configure/test_compile_checks.py

@@ -8,11 +8,11 @@ import unittest
 
 import mozpack.path as mozpath
 from buildconfig import topsrcdir
-from common import ConfigureTestSandbox
 from mozunit import main
 from six import StringIO
 from test_toolchain_helpers import FakeCompiler
 
+from common import ConfigureTestSandbox
 from mozbuild.util import exec_
 
 

python/mozbuild/mozbuild/test/configure/test_moz_configure.py

@@ -2,9 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-from common import BaseConfigureTest, ConfigureTestSandbox
 from mozunit import main
 
+from common import BaseConfigureTest, ConfigureTestSandbox
 from mozbuild.util import ReadOnlyNamespace, exec_, memoized_property
 
 

python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py

@@ -6,13 +6,13 @@ import logging
 import os
 
 import six
-from common import BaseConfigureTest
 from mozboot.util import MINIMUM_RUST_VERSION
 from mozpack import path as mozpath
 from mozunit import main
 from six import StringIO
 from test_toolchain_helpers import CompilerResult, FakeCompiler, PrependFlags
 
+from common import BaseConfigureTest
 from mozbuild.configure.util import Version
 from mozbuild.util import ReadOnlyNamespace, memoize
 

python/mozbuild/mozbuild/test/configure/test_toolkit_moz_configure.py

@@ -5,10 +5,10 @@
 import os
 
 from buildconfig import topsrcdir
-from common import BaseConfigureTest
 from mozpack import path as mozpath
 from mozunit import MockedOpen, main
 
+from common import BaseConfigureTest
 from mozbuild.configure.options import InvalidOptionError
 
 

python/mozbuild/mozbuild/test/configure/test_util.py

@@ -11,11 +11,11 @@ import unittest
 
 import six
 from buildconfig import topsrcdir
-from common import ConfigureTestSandbox
 from mozpack import path as mozpath
 from mozunit import main
 from six import StringIO
 
+from common import ConfigureTestSandbox
 from mozbuild.configure import ConfigureSandbox
 from mozbuild.configure.util import (
     ConfigureOutputHandler,

python/mozbuild/mozbuild/util.py

@@ -430,7 +430,7 @@ class List(list):
             raise ValueError("List can only be created from other list instances.")
 
         self._kwargs = kwargs
-        return super(List, self).__init__(iterable)
+        super(List, self).__init__(iterable)
 
     def extend(self, l):
         if not isinstance(l, list):

python/mozbuild/mozpack/chrome/flags.py

@@ -6,9 +6,10 @@ import re
 from collections import OrderedDict
 
 import six
-from mozpack.errors import errors
 from packaging.version import Version
 
+from mozpack.errors import errors
+
 
 class Flag(object):
     """

python/mozbuild/mozpack/chrome/manifest.py

@@ -5,11 +5,12 @@
 import os
 import re
 
-import mozpack.path as mozpath
 import six
+from six.moves.urllib.parse import urlparse
+
+import mozpack.path as mozpath
 from mozpack.chrome.flags import Flags
 from mozpack.errors import errors
-from six.moves.urllib.parse import urlparse
 
 
 class ManifestEntry(object):

python/mozbuild/mozpack/copier.py

@@ -9,8 +9,9 @@ import stat
 import sys
 from collections import Counter, OrderedDict, defaultdict
 
-import mozpack.path as mozpath
 import six
+
+import mozpack.path as mozpath
 from mozpack.errors import errors
 from mozpack.files import BaseFile, Dest
 

python/mozbuild/mozpack/files.py

@@ -18,18 +18,18 @@ from itertools import chain, takewhile
 from tarfile import TarFile, TarInfo
 from tempfile import NamedTemporaryFile, mkstemp
 
-import mozpack.path as mozpath
 import six
 from jsmin import JavascriptMinify
+
+import mozbuild.makeutil as makeutil
+import mozpack.path as mozpath
+from mozbuild.preprocessor import Preprocessor
+from mozbuild.util import FileAvoidWrite, ensure_unicode, memoize
 from mozpack.chrome.manifest import ManifestEntry, ManifestInterfaces
 from mozpack.errors import ErrorMessage, errors
 from mozpack.executables import elfhack, is_executable, may_elfhack, may_strip, strip
 from mozpack.mozjar import JarReader
 
-import mozbuild.makeutil as makeutil
-from mozbuild.preprocessor import Preprocessor
-from mozbuild.util import FileAvoidWrite, ensure_unicode, memoize
-
 try:
     import hglib
 except ImportError:

python/mozbuild/mozpack/manifests.py

@@ -5,9 +5,10 @@
 import json
 from contextlib import contextmanager
 
-import mozpack.path as mozpath
 import six
 
+import mozpack.path as mozpath
+
 from .files import (
     AbsoluteSymlinkFile,
     ExistingFile,

python/mozbuild/mozpack/mozjar.py

@@ -9,9 +9,9 @@ from collections import OrderedDict
 from io import BytesIO, UnsupportedOperation
 from zipfile import ZIP_DEFLATED, ZIP_STORED
 
-import mozpack.path as mozpath
 import six
 
+import mozpack.path as mozpath
 from mozbuild.util import ensure_bytes
 
 JAR_STORED = ZIP_STORED

python/mozbuild/mozpack/packager/__init__.py

@@ -8,8 +8,10 @@ import os
 import re
 from collections import deque
 
-import mozpack.path as mozpath
 import six
+
+import mozpack.path as mozpath
+from mozbuild.preprocessor import Preprocessor
 from mozpack.chrome.manifest import (
     Manifest,
     ManifestBinaryComponent,
@@ -20,8 +22,6 @@ from mozpack.chrome.manifest import (
 )
 from mozpack.errors import errors
 
-from mozbuild.preprocessor import Preprocessor
-
 
 class Component(object):
     """

python/mozbuild/mozpack/packager/formats.py

@@ -2,6 +2,8 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from six.moves.urllib.parse import urlparse
+
 import mozpack.path as mozpath
 from mozpack.chrome.manifest import (
     Manifest,
@@ -14,7 +16,6 @@ from mozpack.chrome.manifest import (
 from mozpack.copier import FileRegistry, FileRegistrySubtree, Jarrer
 from mozpack.errors import errors
 from mozpack.files import ManifestFile
-from six.moves.urllib.parse import urlparse
 
 """
 Formatters are classes receiving packaging instructions and creating the

python/mozbuild/mozpack/packager/l10n.py

@@ -10,9 +10,10 @@ directory.
 import json
 import os
 
-import mozpack.path as mozpath
 import six
 from createprecomplete import generate_precomplete
+
+import mozpack.path as mozpath
 from mozpack.chrome.manifest import (
     Manifest,
     ManifestChrome,

python/mozbuild/mozpack/packager/unpack.py

@@ -4,6 +4,8 @@
 
 import codecs
 
+from six.moves.urllib.parse import urlparse
+
 import mozpack.path as mozpath
 from mozpack.chrome.manifest import (
     ManifestEntryWithRelPath,
@@ -16,7 +18,6 @@ from mozpack.files import BaseFinder, DeflatedFile, FileFinder, ManifestFile
 from mozpack.mozjar import JarReader
 from mozpack.packager import SimplePackager
 from mozpack.packager.formats import FlatFormatter
-from six.moves.urllib.parse import urlparse
 
 
 class UnpackFinder(BaseFinder):

python/mozbuild/mozpack/test/test_archive.py

@@ -11,6 +11,8 @@ import tempfile
 import unittest
 
 import pytest
+from mozunit import main
+
 from mozpack.archive import (
     DEFAULT_MTIME,
     create_tar_bz2_from_files,
@@ -18,7 +20,6 @@ from mozpack.archive import (
     create_tar_gz_from_files,
 )
 from mozpack.files import GeneratedFile
-from mozunit import main
 
 MODE_STANDARD = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
 

python/mozbuild/mozpack/test/test_chrome_flags.py

@@ -5,6 +5,7 @@
 import unittest
 
 import mozunit
+
 from mozpack.chrome.flags import Flag, Flags, StringFlag, VersionFlag
 from mozpack.errors import ErrorMessage
 

python/mozbuild/mozpack/test/test_chrome_manifest.py

@@ -6,6 +6,7 @@ import os
 import unittest
 
 import mozunit
+
 from mozpack.chrome.manifest import (
     MANIFESTS_TYPES,
     Manifest,

python/mozbuild/mozpack/test/test_copier.py

@@ -6,9 +6,10 @@ import os
 import stat
 import unittest
 
-import mozpack.path as mozpath
 import mozunit
 import six
+
+import mozpack.path as mozpath
 from mozpack.copier import FileCopier, FileRegistry, FileRegistrySubtree, Jarrer
 from mozpack.errors import ErrorMessage
 from mozpack.files import ExistingFile, GeneratedFile

python/mozbuild/mozpack/test/test_errors.py

@@ -7,6 +7,7 @@ import unittest
 
 import mozunit
 import six
+
 from mozpack.errors import AccumulatedErrors, ErrorMessage, errors
 
 

python/mozbuild/mozpack/test/test_files.py

@@ -2,6 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from mozbuild.util import ensure_bytes, ensureParentDir
 from mozpack.errors import ErrorMessage, errors
 from mozpack.files import (
     AbsoluteSymlinkFile,
@@ -24,8 +25,6 @@ from mozpack.files import (
     TarFinder,
 )
 
-from mozbuild.util import ensure_bytes, ensureParentDir
-
 # We don't have hglib installed everywhere.
 try:
     import hglib
@@ -42,9 +41,10 @@ from io import BytesIO
 from tempfile import mkdtemp
 
 import mozfile
-import mozpack.path as mozpath
 import mozunit
 import six
+
+import mozpack.path as mozpath
 from mozpack.chrome.manifest import (
     ManifestContent,
     ManifestLocale,

python/mozbuild/mozpack/test/test_manifests.py

@@ -5,6 +5,7 @@
 import os
 
 import mozunit
+
 from mozpack.copier import FileCopier, FileRegistry
 from mozpack.manifests import InstallManifest, UnreadableInstallManifest
 from mozpack.test.test_files import TestWithTmpDir

python/mozbuild/mozpack/test/test_mozjar.py

@@ -6,9 +6,10 @@ import os
 import unittest
 from collections import OrderedDict
 
-import mozpack.path as mozpath
 import mozunit
 import six
+
+import mozpack.path as mozpath
 from mozpack.files import FileFinder
 from mozpack.mozjar import (
     Deflater,

python/mozbuild/mozpack/test/test_packager.py

@@ -5,9 +5,12 @@
 import os
 import unittest
 
-import mozpack.path as mozpath
 import mozunit
 from buildconfig import topobjdir
+from mozunit import MockedOpen
+
+import mozpack.path as mozpath
+from mozbuild.preprocessor import Preprocessor
 from mozpack.chrome.manifest import (
     ManifestBinaryComponent,
     ManifestContent,
@@ -22,9 +25,6 @@ from mozpack.packager import (
     SimplePackager,
     preprocess_manifest,
 )
-from mozunit import MockedOpen
-
-from mozbuild.preprocessor import Preprocessor
 
 MANIFEST = """
 bar/*

python/mozbuild/mozpack/test/test_packager_formats.py

@@ -5,9 +5,10 @@
 import unittest
 from itertools import chain
 
-import mozpack.path as mozpath
 import mozunit
 import six
+
+import mozpack.path as mozpath
 from mozpack.chrome.manifest import (
     ManifestBinaryComponent,
     ManifestComponent,

python/mozbuild/mozpack/test/test_packager_l10n.py

@@ -6,6 +6,7 @@ import unittest
 
 import mozunit
 import six
+
 from mozpack.chrome.manifest import Manifest, ManifestContent, ManifestLocale
 from mozpack.copier import FileRegistry
 from mozpack.files import GeneratedFile, ManifestFile

python/mozbuild/mozpack/test/test_packager_unpack.py

@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import mozunit
+
 from mozpack.copier import FileCopier, FileRegistry
 from mozpack.packager.formats import FlatFormatter, JarFormatter, OmniJarFormatter
 from mozpack.packager.unpack import unpack_to_registry

python/mozbuild/mozpack/test/test_path.py

@@ -6,6 +6,7 @@ import os
 import unittest
 
 import mozunit
+
 from mozpack.path import (
     basedir,
     basename,

python/mozbuild/mozpack/test/test_pkg.py

@@ -6,8 +6,9 @@ from pathlib import Path
 from string import Template
 from unittest.mock import patch
 
-import mozpack.pkg
 import mozunit
+
+import mozpack.pkg
 from mozpack.pkg import (
     create_bom,
     create_payload,

python/mozbuild/mozpack/test/test_unify.py

@@ -7,14 +7,14 @@ import sys
 from io import StringIO
 
 import mozunit
+
+from mozbuild.util import ensureParentDir
 from mozpack.errors import AccumulatedErrors, ErrorMessage, errors
 from mozpack.files import FileFinder
 from mozpack.mozjar import JarWriter
 from mozpack.test.test_files import MockDest, TestWithTmpDir
 from mozpack.unify import UnifiedBuildFinder, UnifiedFinder
 
-from mozbuild.util import ensureParentDir
-
 
 class TestUnified(TestWithTmpDir):
     def create_one(self, which, path, content):

python/mozbuild/mozpack/unify.py

@@ -10,13 +10,13 @@ from collections import OrderedDict
 from tempfile import mkstemp
 
 import buildconfig
+
 import mozpack.path as mozpath
+from mozbuild.util import hexdump
 from mozpack.errors import errors
 from mozpack.executables import MACHO_SIGNATURES
 from mozpack.files import BaseFile, BaseFinder, ExecutableFile, GeneratedFile
 
-from mozbuild.util import hexdump
-
 # Regular expressions for unifying install.rdf
 FIND_TARGET_PLATFORM = re.compile(
     r"""

python/mozrelease/mozrelease/buglist_creator.py

@@ -10,7 +10,6 @@ from operator import itemgetter
 
 import requests
 from mozilla_version.gecko import GeckoVersion
-
 from taskcluster import Notify, optionsFromEnvironment
 
 BUGLIST_TEMPLATE = "* [Bugs since previous changeset]({url})\n"

python/mozrelease/mozrelease/scriptworker_canary.py

@@ -12,12 +12,11 @@ import tempfile
 from contextlib import contextmanager
 from pathlib import Path
 
+import taskcluster
 from appdirs import user_config_dir
 from gecko_taskgraph import GECKO
 from mach.base import FailedCommandError
 
-import taskcluster
-
 logger = logging.getLogger(__name__)
 
 

taskcluster/gecko_taskgraph/__init__.py

@@ -50,8 +50,8 @@ def register(graph_config):
     """
     from taskgraph import generator
 
-    from gecko_taskgraph import morph  # noqa: trigger morph registration
     from gecko_taskgraph import (  # noqa: trigger target task method registration
+        morph,  # noqa: trigger morph registration
         target_tasks,
     )
     from gecko_taskgraph.parameters import register_parameters

taskcluster/gecko_taskgraph/transforms/task.py

@@ -17,6 +17,7 @@ import time
 
 import attr
 from mozbuild.util import memoize
+from taskcluster.utils import fromNow
 from taskgraph.transforms.base import TransformSequence
 from taskgraph.util.keyed_by import evaluate_keyed_by
 from taskgraph.util.schema import (
@@ -40,7 +41,6 @@ from gecko_taskgraph.util.partners import get_partners_to_be_published
 from gecko_taskgraph.util.scriptworker import BALROG_ACTIONS, get_release_config
 from gecko_taskgraph.util.signed_artifacts import get_signed_artifacts
 from gecko_taskgraph.util.workertypes import get_worker_type, worker_type_implementation
-from taskcluster.utils import fromNow
 
 RUN_TASK = os.path.join(GECKO, "taskcluster", "scripts", "run-task")
 

taskcluster/gecko_taskgraph/util/taskcluster.py

@@ -7,6 +7,7 @@ import logging
 import os
 
 import taskcluster_urls as liburls
+from taskcluster import Hooks
 from taskgraph.util import taskcluster as tc_util
 from taskgraph.util.taskcluster import (
     _do_request,
@@ -16,8 +17,6 @@ from taskgraph.util.taskcluster import (
     get_task_url,
 )
 
-from taskcluster import Hooks
-
 logger = logging.getLogger(__name__)
 
 

testing/condprofile/condprof/client.py

@@ -12,6 +12,8 @@ import tarfile
 import tempfile
 import time
 
+from mozprofile.prefs import Preferences
+
 from condprof import progress
 from condprof.changelog import Changelog
 from condprof.util import (
@@ -21,7 +23,6 @@ from condprof.util import (
     download_file,
     logger,
 )
-from mozprofile.prefs import Preferences
 
 TC_SERVICE = "https://firefox-ci-tc.services.mozilla.com"
 ROOT_URL = TC_SERVICE + "/api/index"

testing/condprofile/condprof/scenarii/full.py

@@ -7,6 +7,7 @@ import os
 import random
 
 from arsenic.errors import UnknownArsenicError, UnknownError
+
 from condprof.helpers import TabSwitcher, execute_async_script, is_mobile
 from condprof.util import get_credentials, logger
 

testing/condprofile/condprof/tests/test_client.py

@@ -7,9 +7,10 @@ import tempfile
 import unittest
 
 import responses
+from mozprofile.prefs import Preferences
+
 from condprof.client import ROOT_URL, TC_SERVICE, get_profile
 from condprof.util import _DEFAULT_SERVER
-from mozprofile.prefs import Preferences
 
 PROFILE = re.compile(ROOT_URL + "/.*/.*tgz")
 PROFILE_FOR_TESTS = os.path.join(os.path.dirname(__file__), "profile")

testing/condprofile/condprof/tests/test_runner.py

@@ -7,6 +7,7 @@ import tempfile
 import unittest
 
 import responses
+
 from condprof import client
 from condprof.client import ROOT_URL, TC_SERVICE
 from condprof.main import main

testing/condprofile/condprof/util.py

@@ -16,10 +16,11 @@ from subprocess import PIPE, Popen
 import mozlog
 import requests
 import yaml
-from condprof import progress
 from requests.exceptions import ConnectionError
 from requests.packages.urllib3.util.retry import Retry
 
+from condprof import progress
+
 TASK_CLUSTER = "TASK_ID" in os.environ.keys()
 DOWNLOAD_TIMEOUT = 30
 

testing/firefox-ui/harness/firefox_ui_harness/cli_functional.py

@@ -4,9 +4,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+from marionette_harness.runtests import cli as mn_cli
+
 from firefox_ui_harness.arguments import FirefoxUIArguments
 from firefox_ui_harness.runners import FirefoxUITestRunner
-from marionette_harness.runtests import cli as mn_cli
 
 
 def cli(args=None):

testing/mach_commands.py

@@ -538,7 +538,7 @@ def run_desktop_test(
 
 
 def run_android_test(command_context, tests, symbols_path, manifest_path, log):
-    import remotecppunittests as remotecppunittests
+    import remotecppunittests
     from mozlog import commandline
 
     parser = remotecppunittests.RemoteCPPUnittestOptions()

testing/marionette/harness/marionette_harness/runner/httpd.py

@@ -16,9 +16,8 @@ import sys
 import time
 
 from six.moves.urllib import parse as urlparse
-from wptserve import handlers, request
+from wptserve import handlers, request, server
 from wptserve import routes as default_routes
-from wptserve import server
 
 root = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
 default_doc_root = os.path.join(root, "www")

testing/marionette/harness/marionette_harness/runtests.py

@@ -6,6 +6,7 @@ import sys
 
 import mozlog
 from marionette_driver import __version__ as driver_version
+
 from marionette_harness import (
     BaseMarionetteArguments,
     BaseMarionetteTestRunner,

testing/mozbase/manifestparser/manifestparser/manifestparser.py

@@ -13,9 +13,8 @@ import types
 
 from six import StringIO, string_types
 
-from .filters import DEFAULT_FILTERS, enabled
+from .filters import DEFAULT_FILTERS, enabled, filterlist
 from .filters import exists as _exists
-from .filters import filterlist
 from .ini import read_ini
 
 __all__ = ["ManifestParser", "TestManifest", "convert"]

testing/mozbase/mozlog/mozlog/formatters/grouping.py

@@ -8,6 +8,7 @@ import subprocess
 import sys
 
 import six
+
 from mozlog.formatters import base
 
 DEFAULT_MOVE_UP_CODE = u"\x1b[A"

testing/mozbase/mozlog/mozlog/handlers/base.py

@@ -8,6 +8,7 @@ import locale
 from threading import Lock
 
 import six
+
 from mozlog.handlers.messagehandler import MessageHandler
 from mozlog.structuredlog import log_levels
 

testing/mozbase/mozlog/mozlog/pytest_mozlog/plugin.py

@@ -4,10 +4,11 @@
 
 import time
 
-import mozlog
 import pytest
 import six
 
+import mozlog
+
 
 def pytest_addoption(parser):
     # We can't simply use mozlog.commandline.add_logging_group(parser) here because

testing/mozbase/mozlog/mozlog/scripts/unstable.py

@@ -7,6 +7,7 @@ import json
 from collections import defaultdict
 
 import six
+
 from mozlog import reader
 
 

testing/mozbase/mozproxy/mozproxy/backends/mitm/android.py

@@ -9,6 +9,7 @@ import sys
 from subprocess import PIPE
 
 import mozinfo
+
 from mozproxy.backends.mitm.mitm import Mitmproxy
 from mozproxy.utils import LOG, download_file_from_url, tooltool_download
 

testing/mozbase/mozproxy/mozproxy/backends/mitm/desktop.py

@@ -6,6 +6,7 @@ import os
 import sys
 
 import mozinfo
+
 from mozproxy.backends.mitm.mitm import Mitmproxy
 from mozproxy.utils import LOG
 

testing/mozbase/mozproxy/mozproxy/backends/mitm/mitm.py

@@ -11,6 +11,7 @@ import time
 import mozinfo
 import six
 from mozprocess import ProcessHandler
+
 from mozproxy.backends.base import Playback
 from mozproxy.recordings import RecordingFile
 from mozproxy.utils import (

testing/mozbase/mozproxy/mozproxy/utils.py

@@ -26,6 +26,7 @@ except ImportError:
 
 from mozlog import get_proxy_logger
 from mozprocess import ProcessHandler
+
 from mozproxy import mozbase_dir, mozharness_dir
 
 LOG = get_proxy_logger(component="mozproxy")

testing/mozbase/mozversion/mozversion/mozversion.py

@@ -9,9 +9,10 @@ import sys
 import zipfile
 
 import mozlog
-from mozversion import errors
 from six.moves import configparser
 
+from mozversion import errors
+
 INI_DATA_MAPPING = (("application", "App"), ("platform", "Build"))
 
 

testing/mozharness/mozharness/base/diskutils.py

@@ -33,9 +33,10 @@ import logging
 import os
 import sys
 
-from mozharness.base.log import INFO, numeric_log_level
 from six import string_types
 
+from mozharness.base.log import INFO, numeric_log_level
+
 # use mozharness log
 log = logging.getLogger(__name__)
 

testing/mozharness/mozharness/base/python.py

@@ -23,6 +23,8 @@ try:
 except ImportError:
     import urllib.parse as urlparse
 
+from six import string_types
+
 import mozharness
 from mozharness.base.errors import VirtualenvErrorList
 from mozharness.base.log import FATAL, WARNING
@@ -32,7 +34,6 @@ from mozharness.base.script import (
     PreScriptAction,
     ScriptMixin,
 )
-from six import string_types
 
 external_tools_path = os.path.join(
     os.path.abspath(os.path.dirname(os.path.dirname(mozharness.__file__))),

testing/mozharness/mozharness/base/script.py

@@ -38,6 +38,9 @@ from io import BytesIO
 
 import mozinfo
 import six
+from mozprocess import ProcessHandler
+from six import binary_type
+
 from mozharness.base.config import BaseConfig
 from mozharness.base.log import (
     DEBUG,
@@ -51,8 +54,6 @@ from mozharness.base.log import (
     OutputParser,
     SimpleFileLogger,
 )
-from mozprocess import ProcessHandler
-from six import binary_type
 
 try:
     import httplib

testing/mozharness/mozharness/mozilla/building/buildbase.py

@@ -21,6 +21,8 @@ from datetime import datetime
 
 import six
 import yaml
+from yaml import YAMLError
+
 from mozharness.base.config import DEFAULT_CONFIG_PATH, BaseConfig, parse_config_file
 from mozharness.base.errors import MakefileErrorList
 from mozharness.base.log import ERROR, FATAL, OutputParser
@@ -37,7 +39,6 @@ from mozharness.mozilla.automation import (
     AutomationMixin,
 )
 from mozharness.mozilla.secrets import SecretsMixin
-from yaml import YAMLError
 
 AUTOMATION_EXIT_CODES = sorted(EXIT_STATUS_DICT.values())
 

testing/mozharness/mozharness/mozilla/testing/android.py

@@ -18,6 +18,7 @@ import time
 from threading import Timer
 
 import six
+
 from mozharness.base.script import PostScriptAction, PreScriptAction
 from mozharness.mozilla.automation import EXIT_STATUS_DICT, TBPL_RETRY
 

testing/mozharness/mozharness/mozilla/testing/codecoverage.py

@@ -14,6 +14,7 @@ import uuid
 import zipfile
 
 import mozinfo
+
 from mozharness.base.script import PostScriptAction, PreScriptAction
 from mozharness.mozilla.testing.per_test_base import SingleTestMixin
 

testing/mozharness/mozharness/mozilla/testing/raptor.py

@@ -15,6 +15,8 @@ import sys
 import tempfile
 from shutil import copyfile, rmtree
 
+from six import string_types
+
 import mozharness
 from mozharness.base.errors import PythonErrorList
 from mozharness.base.log import CRITICAL, DEBUG, ERROR, INFO, OutputParser
@@ -33,7 +35,6 @@ from mozharness.mozilla.testing.codecoverage import (
 )
 from mozharness.mozilla.testing.errors import HarnessErrorList, TinderBoxPrintRe
 from mozharness.mozilla.testing.testbase import TestingMixin, testing_config_options
-from six import string_types
 
 scripts_path = os.path.abspath(os.path.dirname(os.path.dirname(mozharness.__file__)))
 external_tools_path = os.path.join(scripts_path, "external_tools")

testing/mozharness/mozharness/mozilla/testing/talos.py

@@ -19,8 +19,9 @@ import shutil
 import subprocess
 import sys
 
-import mozharness
 import six
+
+import mozharness
 from mozharness.base.config import parse_config_file
 from mozharness.base.errors import PythonErrorList
 from mozharness.base.log import CRITICAL, DEBUG, ERROR, INFO, WARNING, OutputParser

testing/mozharness/mozharness/mozilla/testing/testbase.py

@@ -11,6 +11,9 @@ import os
 import platform
 import ssl
 
+from six.moves import urllib
+from six.moves.urllib.parse import ParseResult, urlparse
+
 from mozharness.base.errors import BaseErrorList
 from mozharness.base.log import FATAL, WARNING
 from mozharness.base.python import (
@@ -28,8 +31,6 @@ from mozharness.mozilla.testing.verify_tools import (
     verify_config_options,
 )
 from mozharness.mozilla.tooltool import TooltoolMixin
-from six.moves import urllib
-from six.moves.urllib.parse import ParseResult, urlparse
 
 INSTALLER_SUFFIXES = (
     ".apk",  # Android

testing/mozharness/mozharness/mozilla/testing/try_tools.py

@@ -11,6 +11,7 @@ import re
 from collections import defaultdict
 
 import six
+
 from mozharness.base.script import PostScriptAction
 from mozharness.base.transfer import TransferMixin
 

testing/raptor/mach_commands.py

@@ -15,9 +15,8 @@ import sys
 
 from mach.decorators import Command
 from mach.util import get_state_dir
-from mozbuild.base import BinaryNotFoundException
+from mozbuild.base import BinaryNotFoundException, MozbuildObject
 from mozbuild.base import MachCommandConditions as Conditions
-from mozbuild.base import MozbuildObject
 
 HERE = os.path.dirname(os.path.realpath(__file__))
 

testing/talos/talos/cmanager_win32.py

@@ -16,6 +16,7 @@ from ctypes import (
 from ctypes.wintypes import DWORD, HANDLE, LONG, LPCSTR, LPCWSTR, LPSTR
 
 import six
+
 from talos.cmanager_base import CounterManager
 from talos.utils import TalosError
 

testing/talos/talos/config.py

@@ -7,6 +7,7 @@ import re
 import sys
 
 from mozlog.commandline import setup_logging
+
 from talos import test, utils
 from talos.cmdline import parse_args
 

testing/talos/talos/ffsetup.py

@@ -16,6 +16,7 @@ import mozrunner
 import six
 from mozlog import get_proxy_logger
 from mozprofile.profile import Profile
+
 from talos import heavy, utils
 from talos.gecko_profile import GeckoProfile
 from talos.utils import TalosError, run_in_debug_mode

testing/talos/talos/output.py

@@ -6,6 +6,7 @@
 # NOTE: we have a circular dependency with output.py when we import results
 import simplejson as json
 from mozlog import get_proxy_logger
+
 from talos import filter, utils
 
 LOG = get_proxy_logger()

testing/talos/talos/results.py

@@ -14,6 +14,7 @@ import os
 import re
 
 import six
+
 from talos import filter, output, utils
 
 

testing/talos/talos/run_tests.py

@@ -14,13 +14,14 @@ import mozversion
 import six
 from mozgeckoprofiler import view_gecko_profile
 from mozlog import get_proxy_logger
+from wptserve import server
+from wptserve.handlers import handler
+
 from talos import utils
 from talos.config import ConfigurationError, get_configs
 from talos.results import TalosResults
 from talos.ttest import TTest
 from talos.utils import TalosError, TalosRegression
-from wptserve import server
-from wptserve.handlers import handler
 
 # directory of this file
 here = os.path.dirname(os.path.realpath(__file__))

testing/talos/talos/talos_process.py

@@ -14,6 +14,7 @@ import psutil
 import six
 from mozlog import get_proxy_logger
 from mozprocess import ProcessHandler
+
 from talos.utils import TalosError
 
 LOG = get_proxy_logger()

testing/talos/talos/ttest.py

@@ -23,6 +23,7 @@ import mozcrash
 import mozfile
 import six
 from mozlog import get_proxy_logger
+
 from talos import results, talosconfig, utils
 from talos.cmanager import CounterManagement
 from talos.ffsetup import FFSetup

testing/talos/talos/unittests/test_config.py

@@ -6,6 +6,7 @@ import conftest
 import mozunit
 import pytest
 import six
+
 from talos.config import (
     DEFAULTS,
     ConfigurationError,

testing/talos/talos/unittests/test_test.py

@@ -1,5 +1,6 @@
 import mozunit
 import pytest
+
 from talos.test import Test, TsBase, register_test, test_dict, ts_paint
 
 

testing/talos/talos/unittests/test_xtalos.py

@@ -1,6 +1,7 @@
 import re
 
 import mozunit
+
 from talos.xtalos.etlparser import NAME_SUBSTITUTIONS
 
 

testing/web-platform/mozilla/tests/webdriver/support/fixtures.py

@@ -10,6 +10,7 @@ import webdriver
 from mozprocess import ProcessHandler
 from mozprofile import Profile
 from mozrunner import FirefoxRunner
+
 from support.network import get_free_port
 
 

testing/xpcshell/mach_commands.py

@@ -11,9 +11,8 @@ import sys
 from multiprocessing import cpu_count
 
 from mach.decorators import Command
-from mozbuild.base import BinaryNotFoundException
+from mozbuild.base import BinaryNotFoundException, MozbuildObject
 from mozbuild.base import MachCommandConditions as conditions
-from mozbuild.base import MozbuildObject
 from mozlog import structured
 from xpcshellcommandline import parser_desktop, parser_remote
 

toolkit/components/telemetry/tests/marionette/harness/telemetry_harness/fog_testcase.py

@@ -3,6 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 import mozlog
+
 from telemetry_harness.fog_ping_server import FOGPingServer
 from telemetry_harness.testcase import TelemetryTestCase