Merge lp:~chris.macnaughton/mojo/error-output into lp:~ost-maintainers/mojo/py3

[Chris MacNaughton]

[Frode Nordahl (fnordahl)]

LGTM, thanks!

review: Approve

=== modified file 'mojo/phase.py'
--- mojo/phase.py	2018-07-17 11:57:20 +0000
+++ mojo/phase.py	2018-07-25 12:38:54 +0000
@@ -988,14 +988,9 @@
                     dl = mojo.juju.DebugLogs(
                         workspace, stage, self.options.get('debug-logs'), self.options.get('debug-logs-stages-to-exclude'))
                     if dl.has_config:
-                        output = e.output
-                        if six.PY3:
-                            output = output.decode('utf-8')
-                        exception_output = "{}\n{}".format(output, dl.get_log_output())
+                        exception_output = "{}\n{}".format(e.output, dl.get_log_output())
                     else:
                         exception_output = e.output
-                        if six.PY3:
-                            exception_output = exception_output.decode('utf-8')
                     raise VerifyPhaseException(exception_output)
             else:
                 # Hooray, success!