diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-21 12:29:16 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-21 22:26:33 +0100 |
commit | 3ddde5f32afe9225994df607f6b8dfcc58f6bdc7 (patch) | |
tree | 852bf239ca9347f8c78b3f1ccc7433f8ba36517d /meta/lib/oeqa/utils/qemurunner.py | |
parent | 01d07f328fb2644169eda5dbffaf2b6117696959 (diff) | |
download | poky-3ddde5f32afe9225994df607f6b8dfcc58f6bdc7.tar.gz |
meta: Update to modern exception syntax
Update older exception syntax to modern one required by python 3.
Compatible with python 2.7.
(From OE-Core rev: d13f0ac614f1d1e2ef2c8ddc71cbfcf76a8dc3f2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils/qemurunner.py')
-rw-r--r-- | meta/lib/oeqa/utils/qemurunner.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 4bede3421c..695402fead 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py | |||
@@ -114,7 +114,7 @@ class QemuRunner: | |||
114 | try: | 114 | try: |
115 | threadsock, threadport = self.create_socket() | 115 | threadsock, threadport = self.create_socket() |
116 | self.server_socket, self.serverport = self.create_socket() | 116 | self.server_socket, self.serverport = self.create_socket() |
117 | except socket.error, msg: | 117 | except socket.error as msg: |
118 | logger.error("Failed to create listening socket: %s" % msg[1]) | 118 | logger.error("Failed to create listening socket: %s" % msg[1]) |
119 | return False | 119 | return False |
120 | 120 | ||
@@ -192,7 +192,7 @@ class QemuRunner: | |||
192 | else: | 192 | else: |
193 | self.ip = ips[0] | 193 | self.ip = ips[0] |
194 | self.server_ip = ips[1] | 194 | self.server_ip = ips[1] |
195 | except IndexError, ValueError: | 195 | except (IndexError, ValueError): |
196 | logger.info("Couldn't get ip from qemu process arguments! Here is the qemu command line used:\n%s\nand output from runqemu:\n%s" % (cmdline, self.getOutput(output))) | 196 | logger.info("Couldn't get ip from qemu process arguments! Here is the qemu command line used:\n%s\nand output from runqemu:\n%s" % (cmdline, self.getOutput(output))) |
197 | self._dump_host() | 197 | self._dump_host() |
198 | self.stop() | 198 | self.stop() |