diff options
Diffstat (limited to 'scripts')
-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): | |||
395 | if not self.__image is None: | 395 | if not self.__image is None: |
396 | try: | 396 | try: |
397 | self.__image.cleanup() | 397 | self.__image.cleanup() |
398 | except ImageError, err: | 398 | except ImageError as err: |
399 | msger.warning("%s" % err) | 399 | msger.warning("%s" % err) |
400 | 400 | ||
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) |
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): | |||
67 | (sout, serr) = process.communicate() | 67 | (sout, serr) = process.communicate() |
68 | # combine stdout and stderr, filter None out | 68 | # combine stdout and stderr, filter None out |
69 | out = ''.join(filter(None, [sout, serr])) | 69 | out = ''.join(filter(None, [sout, serr])) |
70 | except OSError, err: | 70 | except OSError as err: |
71 | if err.errno == 2: | 71 | if err.errno == 2: |
72 | # [Errno 2] No such file or directory | 72 | # [Errno 2] No such file or directory |
73 | msger.error('Cannot run command: %s, lost dependency?' % cmd) | 73 | msger.error('Cannot run command: %s, lost dependency?' % cmd) |