diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-09 14:05:09 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-09 17:32:13 +0100 |
commit | 58304fcce9727fd89564436771356c033ecd22a3 (patch) | |
tree | 88daa489e0e67245dca71a8d1daf783cf5a00308 /bin | |
parent | b60261bf8ade14aca31238b50c243c01adcabc59 (diff) | |
download | bitbake-contrib-58304fcce9727fd89564436771356c033ecd22a3.tar.gz |
bin, toaster: Fix print and exception syntax
This updates the print "" syntax to print() and fixes some exception
handling syntax such that its compatible with python v2 and v3.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/bitbake-diffsigs | 6 | ||||
-rwxr-xr-x | bin/bitbake-dumpsig | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/bin/bitbake-diffsigs b/bin/bitbake-diffsigs index 196f0b73e..67c60dbb0 100755 --- a/bin/bitbake-diffsigs +++ b/bin/bitbake-diffsigs @@ -95,7 +95,7 @@ def find_compare_task(bbhandler, pn, taskname): # Recurse into signature comparison output = bb.siggen.compare_sigfiles(latestfiles[0], latestfiles[1], recursecb) if output: - print '\n'.join(output) + print('\n'.join(output)) sys.exit(0) @@ -130,9 +130,9 @@ else: except IOError as e: logger.error(str(e)) sys.exit(1) - except cPickle.UnpicklingError, EOFError: + except (pickle.UnpicklingError, EOFError): logger.error('Invalid signature data - ensure you are specifying sigdata/siginfo files') sys.exit(1) if output: - print '\n'.join(output) + print('\n'.join(output)) diff --git a/bin/bitbake-dumpsig b/bin/bitbake-dumpsig index 656d93a5a..ffaed1f45 100755 --- a/bin/bitbake-dumpsig +++ b/bin/bitbake-dumpsig @@ -57,9 +57,9 @@ else: except IOError as e: logger.error(str(e)) sys.exit(1) - except cPickle.UnpicklingError, EOFError: + except (pickle.UnpicklingError, EOFError): logger.error('Invalid signature data - ensure you are specifying a sigdata/siginfo file') sys.exit(1) if output: - print '\n'.join(output) + print('\n'.join(output)) |