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/oe | |
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/oe')
-rw-r--r-- | meta/lib/oe/data.py | 2 | ||||
-rw-r--r-- | meta/lib/oe/prservice.py | 2 | ||||
-rw-r--r-- | meta/lib/oe/utils.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/data.py b/meta/lib/oe/data.py index e49572177b..23a9067a60 100644 --- a/meta/lib/oe/data.py +++ b/meta/lib/oe/data.py | |||
@@ -13,5 +13,5 @@ def typed_value(key, d): | |||
13 | 13 | ||
14 | try: | 14 | try: |
15 | return oe.maketype.create(d.getVar(key, True) or '', var_type, **flags) | 15 | return oe.maketype.create(d.getVar(key, True) or '', var_type, **flags) |
16 | except (TypeError, ValueError), exc: | 16 | except (TypeError, ValueError) as exc: |
17 | bb.msg.fatal("Data", "%s: %s" % (key, str(exc))) | 17 | bb.msg.fatal("Data", "%s: %s" % (key, str(exc))) |
diff --git a/meta/lib/oe/prservice.py b/meta/lib/oe/prservice.py index b0cbcb1fbc..9e5a0c9830 100644 --- a/meta/lib/oe/prservice.py +++ b/meta/lib/oe/prservice.py | |||
@@ -9,7 +9,7 @@ def prserv_make_conn(d, check = False): | |||
9 | if not conn.ping(): | 9 | if not conn.ping(): |
10 | raise Exception('service not available') | 10 | raise Exception('service not available') |
11 | d.setVar("__PRSERV_CONN",conn) | 11 | d.setVar("__PRSERV_CONN",conn) |
12 | except Exception, exc: | 12 | except Exception as exc: |
13 | bb.fatal("Connecting to PR service %s:%s failed: %s" % (host_params[0], host_params[1], str(exc))) | 13 | bb.fatal("Connecting to PR service %s:%s failed: %s" % (host_params[0], host_params[1], str(exc))) |
14 | 14 | ||
15 | return conn | 15 | return conn |
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index d1dfbfb95d..32d61794ee 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py | |||
@@ -264,7 +264,7 @@ class ThreadedWorker(Thread): | |||
264 | 264 | ||
265 | try: | 265 | try: |
266 | func(self, *args, **kargs) | 266 | func(self, *args, **kargs) |
267 | except Exception, e: | 267 | except Exception as e: |
268 | print(e) | 268 | print(e) |
269 | finally: | 269 | finally: |
270 | self.tasks.task_done() | 270 | self.tasks.task_done() |