Merge ~smoser/curtin:fix/pyflakes-2.0.0-reported-issues into curtin:master

[Scott Moser]

pyflakes: fix unused variable references identified by pyflakes 2.0.0.

A newer version of pyflakes (2.0.0) was released over the last weekend.
It identifed some unused variables that version 1.6.0 did not identify.
The change here merely fixes those unused variables.

The fact that c-i hit this is not intended. A future fix is needed to
properly pin the version of pyflakes so that it does not happen again.

see commit message

[Ryan Harper (raharper)]

Good fixes.

review: Approve

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:1273f99d90b1a2c7d6611480790fa4725b50f4e5
https://jenkins.ubuntu.com/server/job/curtin-ci/946/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/946
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/946
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/946
    FAILURE: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/946/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/946/rebuild

review: Needs Fixing (continuous-integration)

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:1273f99d90b1a2c7d6611480790fa4725b50f4e5
https://jenkins.ubuntu.com/server/job/curtin-ci/947/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-amd64/947
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/947
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/947
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/947

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/947/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

failure in first c-i run was filed as bug 1772481

failure was not related to this code, so landing this.

review: Approve

[Scott Moser (smoser)]

An upstream commit landed for this bug.

To view that commit see the following URL:
https://git.launchpad.net/curtin/commit/?id=48b24ca6

diff --git a/curtin/commands/curthooks.py b/curtin/commands/curthooks.py
index d45c3a8..a514560 100644
--- a/curtin/commands/curthooks.py
+++ b/curtin/commands/curthooks.py
@@ -292,7 +292,7 @@ def setup_grub(cfg, target):
     storage_cfg_odict = None
     try:
         storage_cfg_odict = extract_storage_ordered_dict(cfg)
-    except ValueError as e:
+    except ValueError:
         pass
 
     if storage_cfg_odict:
@@ -324,7 +324,7 @@ def setup_grub(cfg, target):
             try:
                 (blockdev, part) = block.get_blockdev_for_partition(maybepart)
                 blockdevs.add(blockdev)
-            except ValueError as e:
+            except ValueError:
                 # if there is no syspath for this device such as a lvm
                 # or raid device, then a ValueError is raised here.
                 LOG.debug("failed to find block device for %s", maybepart)
diff --git a/curtin/url_helper.py b/curtin/url_helper.py
index d4d43a9..43c5c36 100644
--- a/curtin/url_helper.py
+++ b/curtin/url_helper.py
@@ -227,7 +227,7 @@ def geturl(url, headers=None, headers_cb=None, exception_cb=None,
         try:
             return _geturl(url=url, headers=headers, headers_cb=headers_cb,
                            exception_cb=exception_cb, data=data)
-        except _ReRaisedException as e:
+        except _ReRaisedException:
             raise curexc.exc
         except Exception as e:
             curexc = e
diff --git a/tests/vmtests/__init__.py b/tests/vmtests/__init__.py
index 5c30a83..0c3d17e 100644
--- a/tests/vmtests/__init__.py
+++ b/tests/vmtests/__init__.py
@@ -1091,7 +1091,7 @@ class VMBaseClass(TestCase):
         # mount output disk
         try:
             cls.collect_output()
-        except Exception as e:
+        except Exception:
             cls.tearDownClass()
             raise
 
diff --git a/tests/vmtests/image_sync.py b/tests/vmtests/image_sync.py
index bbe523a..e2cedc1 100644
--- a/tests/vmtests/image_sync.py
+++ b/tests/vmtests/image_sync.py
@@ -174,7 +174,7 @@ class CurtinVmTestMirror(mirrors.ObjectFilterMirror):
             except IOError as e:
                 if e.errno != errno.ENOENT:
                     raise
-            except JSONDecodeError as e:
+            except JSONDecodeError:
                 jsonfile = os.path.join(self.out_d, dpath)
                 sys.stderr.write("Decode error in:\n  "
                                  "content_id=%s\n  "