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 07:26:42 +0100 |
| commit | 15e88714d6b0a93f72e8a19b083fcc1f2006e128 (patch) | |
| tree | 66afd5cbbade4edd114c4ef1e6f8d17b53a7a3f1 /scripts/lib/wic | |
| parent | 528a1f20939589949831efbb4de6336776efe7d5 (diff) | |
| download | openembedded-core-15e88714d6b0a93f72e8a19b083fcc1f2006e128.tar.gz openembedded-core-15e88714d6b0a93f72e8a19b083fcc1f2006e128.tar.bz2 openembedded-core-15e88714d6b0a93f72e8a19b083fcc1f2006e128.zip | |
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]
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')
| -rw-r--r-- | scripts/lib/wic/imager/direct.py | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/plugin.py | 2 | ||||
| -rw-r--r-- | scripts/lib/wic/utils/runner.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/wic/imager/direct.py b/scripts/lib/wic/imager/direct.py index 319ec1654d..5a3b655a0c 100644 --- a/scripts/lib/wic/imager/direct.py +++ b/scripts/lib/wic/imager/direct.py @@ -395,6 +395,6 @@ class DirectImageCreator(BaseImageCreator): if not self.__image is None: try: self.__image.cleanup() - except ImageError, err: + except ImageError as err: msger.warning("%s" % err) 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(): self.plugin_dirs[pdir] = True msger.debug("Plugin module %s:%s imported"\ % (mod, pymod.__file__)) - except ImportError, err: + except ImportError as err: msg = 'Failed to load plugin %s/%s: %s' \ % (os.path.basename(pdir), mod, err) msger.warning(msg) diff --git a/scripts/lib/wic/utils/runner.py b/scripts/lib/wic/utils/runner.py index 7431917ff0..737751bd73 100644 --- a/scripts/lib/wic/utils/runner.py +++ b/scripts/lib/wic/utils/runner.py @@ -67,7 +67,7 @@ def runtool(cmdln_or_args, catch=1): (sout, serr) = process.communicate() # combine stdout and stderr, filter None out out = ''.join(filter(None, [sout, serr])) - except OSError, err: + except OSError as err: if err.errno == 2: # [Errno 2] No such file or directory msger.error('Cannot run command: %s, lost dependency?' % cmd) |