Merge lp:~smoser/maas-images/trunk.flake8 into lp:maas-images

[Scott Moser]

flake8: fix flake8 errors.

current versions of flake8 as seen in 'tox -e flake8' are complaining
about bare except and a line-too-long. This fixes all those
complaints.

[Lee Trager (ltrager)]

LGTM! Thanks for fixing the errors.

review: Approve

=== modified file 'meph2/commands/dpkg.py'
--- meph2/commands/dpkg.py	2018-05-04 17:10:58 +0000
+++ meph2/commands/dpkg.py	2018-06-25 19:16:11 +0000
@@ -125,8 +125,8 @@
             if package is None or dpkg_a_newer_than_b(
                     packages[pkg_name]['Version'], package['Version']):
                 package = packages[pkg_name]
-                sys.stderr.write(
-                    'Found %s-%s in %s\n' % (pkg_name, package['Version'], dist))
+                sys.stderr.write('Found %s-%s in %s\n' %
+                                 (pkg_name, package['Version'], dist))
     # Download it if it was found and a dest was set
     if package is not None and dest is not None:
         pkg_data = geturl('%s/%s' % (archive, package['Filename']))

=== modified file 'meph2/commands/meph2_util.py'
--- meph2/commands/meph2_util.py	2017-02-11 01:29:31 +0000
+++ meph2/commands/meph2_util.py	2018-06-25 19:16:11 +0000
@@ -390,7 +390,7 @@
             reaped.add(orphan)
             try:
                 os.removedirs(os.path.dirname(location))
-            except:
+            except OSError:
                 pass
 
     if not args.dry_run:

=== modified file 'meph2/util.py'
--- meph2/util.py	2016-10-07 02:51:20 +0000
+++ meph2/util.py	2018-06-25 19:16:11 +0000
@@ -29,6 +29,11 @@
 import sys
 import tempfile
 
+try:
+    JSONDecodeError = json.decoder.JSONDecodeError
+except AttributeError:
+    JSONDecodeError = ValueError
+
 # for callers convenience
 timestamp = sutil.timestamp
 
@@ -159,7 +164,7 @@
         with open(filename) as orphan_file:
             known_orphans = json.load(orphan_file)
             return known_orphans
-    except:
+    except JSONDecodeError:
         raise Exception(
             '%s exists but is not a valid orphan file' % filename
         )
@@ -181,8 +186,8 @@
             with open(filename, 'w') as orphan_file:
                 json.dump(orphans, orphan_file, indent=1)
                 orphan_file.write("\n")
-    except:
-        raise Exception('Cannot write orphan file %s' % filename)
+    except Exception as exc:
+        raise Exception('Cannot write orphan file %s: %s' % (filename, exc))
 
 
 def empty_iid_products(content_id):
@@ -232,14 +237,14 @@
         if summer.check():
             try:
                 os.rename(tf.name, path)
-            except:
+            except OSError:
                 os.unlink(tf.name)
                 raise
         else:
             found = summer.hexdigest()
             try:
                 size = os.path.getsize(tf.name)
-            except:
+            except OSError:
                 size = "unavailable"
             os.unlink(tf.name)