diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-05-04 16:06:19 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-14 23:05:13 +0100 |
commit | e301be3cd09499e605fb204fc4f197eca11f9305 (patch) | |
tree | 65845d48cb3bc4b0b94211f12dab6a5ea9b93b1a /scripts/lib/wic/plugin.py | |
parent | ed10a80c2c113acbdd1c9602a4a7d0d8fc799a62 (diff) | |
download | poky-e301be3cd09499e605fb204fc4f197eca11f9305.tar.gz |
wic: use new syntax of 'except' statement
New syntax 'except Exception as err' is supported by Python >= 2.7.
Old syntax 'except Exception, err' is not supported by Python 3.
Used new syntax to be able to run wic on Python 3.
[YOCTO #9412]
(From OE-Core rev: 15e88714d6b0a93f72e8a19b083fcc1f2006e128)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/plugin.py')
-rw-r--r-- | scripts/lib/wic/plugin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/plugin.py b/scripts/lib/wic/plugin.py index 83af9b05df..dcbaa08556 100644 --- a/scripts/lib/wic/plugin.py +++ b/scripts/lib/wic/plugin.py | |||
@@ -97,7 +97,7 @@ class PluginMgr(): | |||
97 | self.plugin_dirs[pdir] = True | 97 | self.plugin_dirs[pdir] = True |
98 | msger.debug("Plugin module %s:%s imported"\ | 98 | msger.debug("Plugin module %s:%s imported"\ |
99 | % (mod, pymod.__file__)) | 99 | % (mod, pymod.__file__)) |
100 | except ImportError, err: | 100 | except ImportError as err: |
101 | msg = 'Failed to load plugin %s/%s: %s' \ | 101 | msg = 'Failed to load plugin %s/%s: %s' \ |
102 | % (os.path.basename(pdir), mod, err) | 102 | % (os.path.basename(pdir), mod, err) |
103 | msger.warning(msg) | 103 | msger.warning(msg) |