Merge ~ajorgens/cloud-init:py27-analyze into cloud-init:master

[Andrew Jorgensen]

Some Python 3 exception names crept into the cloud-init analyze code. This patches those back out at a cost of catching less specific parents of the desired exceptions.

[Chad Smith (chad.smith)]

Oops. Thanks Andrew. Yeah, sloppy. my bad. Hmm wondering if we need IOError there too.

[Andrew Jorgensen (ajorgens)]

> Oops. Thanks Andrew. Yeah, sloppy. my bad. Hmm wondering if we need IOError
> there too.

I don't *think* so.

[Scott Moser (smoser)]

looks good.
FileNotFoundError and PermissionError are both OSError

[Scott Moser (smoser)]

review: Approve

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

PASSED: Continuous integration, rev:95f50446acb2b0ae71eb2633ce20930d30fded5d
https://jenkins.ubuntu.com/server/job/cloud-init-ci/210/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/210/rebuild

review: Approve (continuous-integration)

diff --git a/cloudinit/analyze/__main__.py b/cloudinit/analyze/__main__.py
index 71cba4f..69b9e43 100644
--- a/cloudinit/analyze/__main__.py
+++ b/cloudinit/analyze/__main__.py
@@ -130,7 +130,7 @@ def configure_io(args):
     else:
         try:
             infh = open(args.infile, 'r')
-        except (FileNotFoundError, PermissionError):
+        except OSError:
             sys.stderr.write('Cannot open file %s\n' % args.infile)
             sys.exit(1)
 
@@ -139,7 +139,7 @@ def configure_io(args):
     else:
         try:
             outfh = open(args.outfile, 'w')
-        except PermissionError:
+        except OSError:
             sys.stderr.write('Cannot open file %s\n' % args.outfile)
             sys.exit(1)
 
diff --git a/cloudinit/analyze/show.py b/cloudinit/analyze/show.py
index 3b356bb..3e778b8 100644
--- a/cloudinit/analyze/show.py
+++ b/cloudinit/analyze/show.py
@@ -201,7 +201,7 @@ def load_events(infile, rawdata=None):
     j = None
     try:
         j = json.loads(data)
-    except json.JSONDecodeError:
+    except ValueError:
         pass
 
     return j, data