Merge ~jslarraz/review-tools:run-black into review-tools:master

[Jorge Sancho Larraz]

As discussed we want to start enforcing black format in review-tools. This PR should only include format changes to adopt meet black format.

[Alex Murray (alexmurray)]

LGTM - as seen in the lpci test log:

:: ./run-black
:: = black =
:: Checking ./reviewtools/__init__.py
:: Checking ./reviewtools/available.py
:: Checking ./reviewtools/common.py
:: Checking ./reviewtools/debversion.py
:: Checking ./reviewtools/email.py
:: Checking ./reviewtools/modules.py
:: Checking ./reviewtools/overrides.py
:: Checking ./reviewtools/rr_common.py
:: Checking ./reviewtools/sr_common.py
:: Checking ./reviewtools/sr_declaration.py
:: Checking ./reviewtools/sr_functional.py
:: Checking ./reviewtools/sr_lint.py
:: Checking ./reviewtools/sr_security.py
:: Checking ./reviewtools/sr_skeleton.py
:: Checking ./reviewtools/sr_tests.py
:: Checking ./reviewtools/store.py
:: Checking ./reviewtools/usn.py
:: Checking ./reviewtools/tests/__init__.py
:: Checking ./reviewtools/tests/test_available.py
:: Checking ./reviewtools/tests/test_bbb_example_sr_skeleton.py
:: Checking ./reviewtools/tests/test_common.py
:: Checking ./reviewtools/tests/test_debversion.py
:: Checking ./reviewtools/tests/test_email.py
:: Checking ./reviewtools/tests/test_modules.py
:: Checking ./reviewtools/tests/test_sr_common.py
:: Checking ./reviewtools/tests/test_sr_declaration.py
:: Checking ./reviewtools/tests/test_sr_functional.py
:: Checking ./reviewtools/tests/test_sr_lint.py
:: Checking ./reviewtools/tests/test_sr_security.py
:: Checking ./reviewtools/tests/test_store.py
:: Checking ./reviewtools/tests/test_usn.py
:: Checking ./reviewtools/tests/utils.py
:: Checking ./bin/snap-review
:: Checking ./bin/create-snap-declaration
:: Checking ./bin/dump-tool
:: Checking ./bin/get-base-declaration
:: Checking ./bin/store-query
:: Checking ./bin/rock-updates-available
:: Checking ./bin/snap-updates-available
:: Checking ./bin/snap-check-declaration
:: Checking ./bin/snap-check-lint
:: Checking ./bin/snap-check-security
:: Checking ./bin/snap-check-skeleton
:: Checking ./bin/snap-verify-declaration

review: Approve

diff --git a/reviewtools/modules.py b/reviewtools/modules.py
index bd8be66..9b93f32 100644
--- a/reviewtools/modules.py
+++ b/reviewtools/modules.py
@@ -56,6 +56,7 @@ def find_main_class(module_name):
         fullpath = "%s/%s.py" % (dir, module_name)
         if os.path.isfile(fullpath):
             import importlib.util
+
             spec = importlib.util.spec_from_file_location(module_name, fullpath)
             if spec is None or spec.loader is None:
                 continue
diff --git a/reviewtools/overrides.py b/reviewtools/overrides.py
index a1db622..60d833b 100644
--- a/reviewtools/overrides.py
+++ b/reviewtools/overrides.py
@@ -1271,7 +1271,7 @@ canonical_security = [
     "[e-mail]",
     "[e-mail]",
     "[e-mail]",
-    "[e-mail]"
+    "[e-mail]",
 ]
 
 canonical_server = ["[e-mail]", "[e-mail]"]
diff --git a/reviewtools/sr_common.py b/reviewtools/sr_common.py
index 4d33459..201a0dc 100644
--- a/reviewtools/sr_common.py
+++ b/reviewtools/sr_common.py
@@ -286,9 +286,11 @@ class SnapReview(Review):
             "posix-mq/plugs": "",
         },
         "pwm": {"chip-number/slots": 0, "channel/slots": 0},
-        "qualcomm-ipc-router": {"address/slots": "",
-                                "qcipc/plugs": "",
-                                "qcipc/slots": ""},
+        "qualcomm-ipc-router": {
+            "address/slots": "",
+            "qcipc/plugs": "",
+            "qcipc/slots": "",
+        },
         "raw-volume": {"path/slots": ""},
         "sd-control": {"flavor/plugs": ""},
         "serial-port": {
diff --git a/reviewtools/sr_functional.py b/reviewtools/sr_functional.py
index 6ec2300..bbdc56b 100644
--- a/reviewtools/sr_functional.py
+++ b/reviewtools/sr_functional.py
@@ -62,7 +62,7 @@ class SnapReviewFunctional(SnapReview):
 
             # read in current state
             self.curr_state = {}
-            for (line, item) in self.unsquashfs_lln_entries:
+            for line, item in self.unsquashfs_lln_entries:
                 if item is None:
                     continue
 
diff --git a/reviewtools/sr_lint.py b/reviewtools/sr_lint.py
index d8cdca4..c94340a 100644
--- a/reviewtools/sr_lint.py
+++ b/reviewtools/sr_lint.py
@@ -3295,7 +3295,8 @@ class SnapReviewLint(SnapReview):
     def check_mpris_slot_name(self):
         """Check mpris slot name attribute is valid
 
-        https://github.com/snapcore/snapd/blob/55909123bcf261d11c9714b9245e9307f64f6891/interfaces/builtin/mpris.go#L215"""
+        https://github.com/snapcore/snapd/blob/55909123bcf261d11c9714b9245e9307f64f6891/interfaces/builtin/mpris.go#L215
+        """
         if "slots" not in self.snap_yaml:
             return
 
diff --git a/reviewtools/sr_security.py b/reviewtools/sr_security.py
index 27f2ea8..5353208 100644
--- a/reviewtools/sr_security.py
+++ b/reviewtools/sr_security.py
@@ -179,7 +179,10 @@ class SnapReviewSecurity(SnapReview):
 
         orig_stat = os.stat(orig)
         resq_stat = os.stat(resq)
-        debug_output += "\norig size: %d\nresq_size: %d" % (orig_stat.st_size, resq_stat.st_size)
+        debug_output += "\norig size: %d\nresq_size: %d" % (
+            orig_stat.st_size,
+            resq_stat.st_size,
+        )
 
         return debug_output
 
@@ -376,8 +379,9 @@ class SnapReviewSecurity(SnapReview):
         # If repacked package is smaller then original one, that means it's
         # truncated with the minimum size.
         if os.stat(fn).st_size == SNAP_MINIMUM_SIZE and (
-                os.stat(tmp_repack).st_size < os.stat(fn).st_size):
-            with open(tmp_repack, 'ab') as f:
+            os.stat(tmp_repack).st_size < os.stat(fn).st_size
+        ):
+            with open(tmp_repack, "ab") as f:
                 f.truncate(SNAP_MINIMUM_SIZE)
 
         (rc, out) = cmd(["sha512sum", tmp_repack])
@@ -537,7 +541,7 @@ class SnapReviewSecurity(SnapReview):
         readdir_pat = re.compile(r"^r.xr.xr.x")
         errors = []
 
-        for (line, item) in self.unsquashfs_lln_entries:
+        for line, item in self.unsquashfs_lln_entries:
             if item is None:
                 continue
 
@@ -621,7 +625,7 @@ class SnapReviewSecurity(SnapReview):
                 if ref in self.base_declaration["slots"]:
                     ok = False
                     if pkgname in sec_iface_ref_matches_base_decl_overrides:
-                        for (aIface, aRef) in sec_iface_ref_matches_base_decl_overrides[
+                        for aIface, aRef in sec_iface_ref_matches_base_decl_overrides[
                             pkgname
                         ]:
                             if (
diff --git a/reviewtools/tests/test_debversion.py b/reviewtools/tests/test_debversion.py
index 406c72e..f5190ec 100644
--- a/reviewtools/tests/test_debversion.py
+++ b/reviewtools/tests/test_debversion.py
@@ -81,7 +81,7 @@ class TestDebVersion(TestCase):
             ),
         ]
         print("")
-        for (av, bv, expected) in versions:
+        for av, bv, expected in versions:
             print("  checking compare(%s, %s) == %d" % (av, bv, expected))
             a = DebVersion(av)
             b = DebVersion(bv)
diff --git a/reviewtools/tests/test_email.py b/reviewtools/tests/test_email.py
index f665bc5..fa2e30f 100644
--- a/reviewtools/tests/test_email.py
+++ b/reviewtools/tests/test_email.py
@@ -28,7 +28,7 @@ class TestEmail(TestCase):
             ("Foo Bar <[e-mail]>", "[e-mail]"),
             ("[e-mail]", "[e-mail]"),
         ]
-        for (addr, expected) in addresses:
+        for addr, expected in addresses:
             self.assertEqual(sanitize_addr(addr), expected)
 
     def test_check_sanitize_addr_invalid(self):
@@ -40,5 +40,5 @@ class TestEmail(TestCase):
             ("@foo.bar", ""),
             ("foo@@bar", ""),
         ]
-        for (addr, expected) in addresses:
+        for addr, expected in addresses:
             self.assertEqual(sanitize_addr(addr), expected)
diff --git a/reviewtools/tests/test_sr_declaration.py b/reviewtools/tests/test_sr_declaration.py
index cef3967..3d58737 100644
--- a/reviewtools/tests/test_sr_declaration.py
+++ b/reviewtools/tests/test_sr_declaration.py
@@ -7729,7 +7729,6 @@ slots:
                 ],
             ),
         ]:
-
             self.set_test_snap_yaml("plugs", plugs)
             overrides = {"snap_decl_plugs": {"iface": {"%s" % (cstr): overrides}}}
             c = SnapReviewDeclaration(self.test_name, overrides=overrides)
@@ -7835,7 +7834,6 @@ slots:
                 ],
             ),
         ]:
-
             self.set_test_snap_yaml("plugs", plugs)
             overrides = {"snap_decl_plugs": {"iface": {"%s" % (cstr): overrides}}}
             c = SnapReviewDeclaration(self.test_name, overrides=overrides)
@@ -7911,7 +7909,6 @@ slots:
                 ],
             ),
         ]:
-
             self.set_test_snap_yaml("plugs", plugs)
             overrides = {"snap_decl_plugs": {"iface": {"%s" % (cstr): overrides}}}
             c = SnapReviewDeclaration(self.test_name, overrides=overrides)
diff --git a/reviewtools/tests/test_sr_functional.py b/reviewtools/tests/test_sr_functional.py
index ebd760e..8b97757 100644
--- a/reviewtools/tests/test_sr_functional.py
+++ b/reviewtools/tests/test_sr_functional.py
@@ -284,7 +284,7 @@ crw-rw-rw- 0/0             1,  3 2020-03-14 18:21 squashfs-root/dev/null
         hdr, entries = unsquashfs_lln_parse(lln)
 
         state = {}
-        for (line, item) in entries:
+        for line, item in entries:
             state[item[StatLLN.FILENAME]] = item
             if "libc-2.31.so" in line:
                 state[item[StatLLN.FILENAME]]["symbols"] = {
@@ -297,7 +297,7 @@ crw-rw-rw- 0/0             1,  3 2020-03-14 18:21 squashfs-root/dev/null
 
         self.assertEqual(len(entries), len(serial))
         self.assertEqual(len(serial), 7)
-        for (idx, map) in [
+        for idx, map in [
             (".", {"filetype": "d", "mode": "rwxr-xr-x", "owner": "0/0"}),
             ("./bin", {"filetype": "d", "mode": "rwxr-xr-x", "owner": "0/0"}),
             ("./bin/cat", {"filetype": "-", "mode": "rwxr-xr-x", "owner": "0/0"}),
@@ -378,7 +378,7 @@ crw-rw-rw- 0/0             1,  3 2020-03-14 18:21 squashfs-root/dev/null
         c = SnapReviewFunctional(self.test_name)
 
         state = {}
-        for (line, item) in entries:
+        for line, item in entries:
             state[item[StatLLN.FILENAME]] = item
 
         serial = c._serialize(state)
@@ -451,7 +451,7 @@ crw-rw-rw- 0/0             1,  3 2020-03-14 18:21 squashfs-root/dev/null
         self.assertEqual(len(state), len(entries))
         self.assertEqual(len(state), 7)
 
-        for (idx, item) in [
+        for idx, item in [
             (
                 ".",
                 {
diff --git a/reviewtools/tests/test_sr_lint.py b/reviewtools/tests/test_sr_lint.py
index 692e77e..46f141c 100644
--- a/reviewtools/tests/test_sr_lint.py
+++ b/reviewtools/tests/test_sr_lint.py
@@ -1000,7 +1000,9 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
     def test_check_link_with_tilde(self):
         """Test check_link"""
         links = {
-            "source-code": ["https://code.launchpad.net/~chromium-team/chromium-browser/+git/snap-from-source/+ref/stable"],
+            "source-code": [
+                "https://code.launchpad.net/~chromium-team/chromium-browser/+git/snap-from-source/+ref/stable"
+            ],
         }
         self.set_test_snap_yaml("links", links)
         c = SnapReviewLint(self.test_name)
@@ -4753,7 +4755,7 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
                 "lint-snap-v2:base_valid": {
                     "text": "(NEEDS REVIEW) snap grade (stable) does not match base grade (stable)"
                 }
-            }
+            },
         }
         self.check_results(r, expected=expected)
         name = c._get_check_name("base_valid")
@@ -5071,7 +5073,9 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
         expected_counts = {"info": 2, "warn": 0, "error": 0}
         self.check_results(r, expected_counts)
 
-    def test_check_sockets_invalid_listen_stream_snap_user_data_without_user_daemon_scope(self):
+    def test_check_sockets_invalid_listen_stream_snap_user_data_without_user_daemon_scope(
+        self,
+    ):
         """Test check_apps_sockets() - invalid listen-stream SNAP_USER_DATA without user daemon-scope"""
         self.set_test_snap_yaml(
             "apps",
@@ -5088,8 +5092,12 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
         """Test check_apps_sockets() - valid listen-stream SNAP_USER_DATA with user daemon-scope"""
         self.set_test_snap_yaml(
             "apps",
-            {"foo": {"sockets": {"sock1": {"listen-stream": "$SNAP_USER_DATA/sock"}},
-                     "daemon-scope": "user"}},
+            {
+                "foo": {
+                    "sockets": {"sock1": {"listen-stream": "$SNAP_USER_DATA/sock"}},
+                    "daemon-scope": "user",
+                }
+            },
         )
 
         c = SnapReviewLint(self.test_name)
@@ -5102,8 +5110,12 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
         """Test check_apps_sockets() - valid listen-stream SNAP_USER_COMMON with user daemon-scope"""
         self.set_test_snap_yaml(
             "apps",
-            {"foo": {"sockets": {"sock1": {"listen-stream": "$SNAP_USER_COMMON/sock"}},
-                     "daemon-scope": "user"}},
+            {
+                "foo": {
+                    "sockets": {"sock1": {"listen-stream": "$SNAP_USER_COMMON/sock"}},
+                    "daemon-scope": "user",
+                }
+            },
         )
 
         c = SnapReviewLint(self.test_name)
@@ -5116,8 +5128,12 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
         """Test check_apps_sockets() - valid listen-stream XDG_RUNTIME_DIR with user daemon-scope"""
         self.set_test_snap_yaml(
             "apps",
-            {"foo": {"sockets": {"sock1": {"listen-stream": "$XDG_RUNTIME_DIR/sock"}},
-                     "daemon-scope": "user"}},
+            {
+                "foo": {
+                    "sockets": {"sock1": {"listen-stream": "$XDG_RUNTIME_DIR/sock"}},
+                    "daemon-scope": "user",
+                }
+            },
         )
 
         c = SnapReviewLint(self.test_name)
@@ -6517,7 +6533,7 @@ class TestSnapReviewLint(sr_tests.TestSnapReview):
             ("snap.foo.bar.ico", None),
             ("snap.foo.bar", None),
         ]
-        for (fn, exreal) in valid:
+        for fn, exreal in valid:
             valid, real_fn = c._verify_icon_path(fn)
             self.assertTrue(valid)
             self.assertEqual(real_fn, exreal)
diff --git a/reviewtools/tests/test_sr_security.py b/reviewtools/tests/test_sr_security.py
index 9989747..de1cc44 100644
--- a/reviewtools/tests/test_sr_security.py
+++ b/reviewtools/tests/test_sr_security.py
@@ -1071,7 +1071,7 @@ slots:
             (pkg, "/test", "rwxrwxrwt", {"/test": "rwxrwxrwt"}, True),
             (pkg, "/test", "rwxrwxrwt", {"/test": ["rwxrwxrwT", "rwxrwxrwt"]}, True),
         ]
-        for (p, f, m, override, exp) in tests:
+        for p, f, m, override, exp in tests:
             if p is not None:
                 sec_mode_overrides[p] = override
             c = SnapReviewSecurity(self.test_name)
diff --git a/reviewtools/tests/test_store.py b/reviewtools/tests/test_store.py
index cd6c3d1..5c1b8cd 100644
--- a/reviewtools/tests/test_store.py
+++ b/reviewtools/tests/test_store.py
@@ -594,7 +594,8 @@ class TestStore(TestCase):
         self,
     ):
         """Test get_package_revisions() - parts/stage-packages and
-        primed-stage-packages are None has no security notices if no usn for build-pkgs"""
+        primed-stage-packages are None has no security notices if no usn for build-pkgs
+        """
         for i in range(len(self.store_db[0]["revisions"])):
             m = yaml.load(
                 self.store_db[0]["revisions"][i]["manifest_yaml"],
@@ -1211,7 +1212,12 @@ class TestStore(TestCase):
 
     def test_check_get_secnots_ignore_pockets(self):
         """Test get_secnots_for_manifest() - ignore_pockets"""
-        for ignore_pockets in [[], ["esm-apps"], ["esm-apps/focal"], ["esm-apps/jammy"]]:
+        for ignore_pockets in [
+            [],
+            ["esm-apps"],
+            ["esm-apps/focal"],
+            ["esm-apps/jammy"],
+        ]:
             m = yaml.load(
                 self.store_esm_apps_db[0]["revisions"][0]["manifest_yaml"],
                 Loader=yaml.SafeLoader,
@@ -2174,7 +2180,7 @@ class TestStore(TestCase):
             ("4.4.0-161", "4.4.0.161.999999"),
             ("4.4.0-140-1", "4.4.0.140.999999"),
         ]
-        for (v, expected) in tests:
+        for v, expected in tests:
             res = store.convert_canonical_kernel_version(v)
             self.assertEqual(res, expected)
 
@@ -2190,7 +2196,7 @@ class TestStore(TestCase):
             ("1.2-3+git1234ubuntu0.1", "1.2-3+git1234ubuntu0.1"),
             ("1.2-3+git1234ubuntu0.1+deadbeef", "1.2-3+git1234ubuntu0.1"),
         ]
-        for (v, expected) in tests:
+        for v, expected in tests:
             res = store.convert_canonical_app_version(v)
             self.assertEqual(res, expected)
 
@@ -2600,7 +2606,12 @@ class TestStore(TestCase):
     def test_check_get_package_revisions_ignore_pockets(self):
         """Test get_package_revisions() - ignore_pockets=esm-apps"""
         errors = {}
-        for ignore_pockets in [[], ["esm-apps"], ["esm-apps/focal"], ["esm-apps/jammy"]]:
+        for ignore_pockets in [
+            [],
+            ["esm-apps"],
+            ["esm-apps/focal"],
+            ["esm-apps/jammy"],
+        ]:
             with self.subTest():
                 res = store.get_pkg_revisions(
                     read_file_as_json_dict("./tests/test-store-unittest-esm-apps.db")[