From d1ae3f2ecc2a4eda2b52d0ac08c8f79423f71213 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Thu, 15 Aug 2019 18:50:47 +0100
Subject: [PATCH] Fix various linter warnings

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 build-relocatable-install.py | 9 ++++++---
 pressure-vessel-test-ui      | 2 +-
 tests/relocatable-install.py | 1 -
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build-relocatable-install.py b/build-relocatable-install.py
index 7e33e3bfd..e74b7e80c 100755
--- a/build-relocatable-install.py
+++ b/build-relocatable-install.py
@@ -351,7 +351,8 @@ def main():
         installed_binaries = set()      # type: typing.Set[str]
 
         for package, source in (
-            list(DEPENDENCIES.items()) + list(PRIMARY_ARCH_DEPENDENCIES.items())
+            list(DEPENDENCIES.items())
+            + list(PRIMARY_ARCH_DEPENDENCIES.items())
         ):
             if os.path.exists('/usr/share/doc/{}/copyright'.format(package)):
                 installed_binaries.add(package)
@@ -373,7 +374,8 @@ def main():
                         package,
                     ], universal_newlines=True).splitlines()
                 ):
-                    source_to_download.add(re.sub(r'[+]srt[0-9a-z.]+$', '', expr))
+                    source_to_download.add(
+                        re.sub(r'[+]srt[0-9a-z.]+$', '', expr))
             else:
                 install(
                     '{}/build-relocatable/usr/share/doc/{}/copyright'.format(
@@ -398,7 +400,8 @@ def main():
                 'dpkg-query',
                 '-W',
                 '-f',
-                r'${binary:Package}\t${Version}\t${Source}\t${Installed-Size}\n',
+                (r'${binary:Package}\t${Version}\t'
+                 r'${Source}\t${Installed-Size}\n'),
             ] + sorted(installed_binaries), stdout=writer)
 
         with open(
diff --git a/pressure-vessel-test-ui b/pressure-vessel-test-ui
index cc638f19f..30340030c 100755
--- a/pressure-vessel-test-ui
+++ b/pressure-vessel-test-ui
@@ -64,7 +64,6 @@ class Gui:
                     os.path.join(source_of_runtimes, member)
                 )
                 files = os.path.join(path, 'files')
-                metadata = os.path.join(path, 'metadata')
 
                 if os.path.isdir(files):
                     description = self._describe_runtime(path)
@@ -180,6 +179,7 @@ class Gui:
             except GLib.Error:
                 pass
             else:
+                assert name is not None
                 variant = name.split('.')[-1]
         except GLib.Error:
             pass
diff --git a/tests/relocatable-install.py b/tests/relocatable-install.py
index edaaba028..9875842bc 100755
--- a/tests/relocatable-install.py
+++ b/tests/relocatable-install.py
@@ -23,7 +23,6 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 import argparse
-import json
 import os
 import subprocess
 import sys
-- 
GitLab