diff options
| -rw-r--r-- | meta/classes/base.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/package.bbclass | 6 | ||||
| -rw-r--r-- | meta/classes/sanity.bbclass | 6 | ||||
| -rw-r--r-- | meta/lib/oe/cachedpath.py | 4 | ||||
| -rw-r--r-- | meta/lib/oe/patch.py | 2 | ||||
| -rw-r--r-- | meta/lib/oe/path.py | 6 | ||||
| -rw-r--r-- | meta/lib/oe/qa.py | 2 | ||||
| -rw-r--r-- | meta/lib/oe/types.py | 2 | ||||
| -rw-r--r-- | meta/lib/oe/utils.py | 2 |
9 files changed, 19 insertions, 15 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 641316d1fa..196acdbb30 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -108,7 +108,7 @@ python base_do_fetch() { try: fetcher = bb.fetch2.Fetch(src_uri, localdata) fetcher.download() - except bb.fetch2.BBFetchException, e: + except bb.fetch2.BBFetchException as e: raise bb.build.FuncFailed(e) } @@ -128,7 +128,7 @@ python base_do_unpack() { try: fetcher = bb.fetch2.Fetch(src_uri, localdata) fetcher.unpack(rootdir) - except bb.fetch2.BBFetchException, e: + except bb.fetch2.BBFetchException as e: raise bb.build.FuncFailed(e) } diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 1a8da40fdb..96228b0bc0 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -777,7 +777,8 @@ python split_and_strip_files () { try: ltarget = cpath.realpath(file, dvar, False) s = cpath.lstat(ltarget) - except OSError, (err, strerror): + except OSError as e: + (err, strerror) = e.args if err != errno.ENOENT: raise # Skip broken symlinks @@ -855,7 +856,8 @@ python split_and_strip_files () { # Skip it if the target doesn't exist try: s = os.stat(fpath) - except OSError, (err, strerror): + except OSError as e: + (err, strerror) = e.args if err != errno.ENOENT: raise continue diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass index ac2314fdcf..766e97e916 100644 --- a/meta/classes/sanity.bbclass +++ b/meta/classes/sanity.bbclass @@ -235,12 +235,14 @@ def check_create_long_filename(filepath, pathname): f = file(testfile, "w") f.close() os.remove(testfile) - except IOError as (errno, strerror): + except IOError as e: + errno, strerror = e.args if errno == 36: # ENAMETOOLONG return "Failed to create a file with a long name in %s. Please use a filesystem that does not unreasonably limit filename length.\n" % pathname else: return "Failed to create a file in %s: %s.\n" % (pathname, strerror) - except OSError as (errno, strerror): + except OSError as e: + errno, strerror = e.args return "Failed to create %s directory in which to run long name sanity check: %s.\n" % (pathname, strerror) return "" diff --git a/meta/lib/oe/cachedpath.py b/meta/lib/oe/cachedpath.py index e350c8a70e..c7860ef4fb 100644 --- a/meta/lib/oe/cachedpath.py +++ b/meta/lib/oe/cachedpath.py @@ -125,7 +125,7 @@ class CachedPath(object): # Note that listdir and error are globals in this module due # to earlier import-*. names = os.listdir(top) - except error, err: + except error as err: if onerror is not None: onerror(err) return @@ -221,7 +221,7 @@ class CachedPath(object): file = self.__realpath_rel(root, file[(len(root) - 1):], root, loop_cnt, assume_dir) else: file = self.__realpath(file, root, loop_cnt, assume_dir)[0] - except OSError, e: + except OSError as e: if e.errno == errno.ELOOP: # make ELOOP more readable; without catching it, there will # be printed a backtrace with 100s of OSError exceptions diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 7ab74fae8a..cbc5cd9755 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -392,7 +392,7 @@ class UserResolver(Resolver): os.chdir(self.patchset.dir) try: self.patchset.Push(False) - except CmdError, v: + except CmdError as v: # Patch application failed patchcmd = self.patchset.Push(True, False, False) diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py index 76a6ed8314..d8eb80225f 100644 --- a/meta/lib/oe/path.py +++ b/meta/lib/oe/path.py @@ -107,7 +107,7 @@ def remove(path, recurse=True): for name in glob.glob(path): try: os.unlink(name) - except OSError, exc: + except OSError as exc: if recurse and exc.errno == errno.EISDIR: shutil.rmtree(name) elif exc.errno != errno.ENOENT: @@ -119,7 +119,7 @@ def symlink(source, destination, force=False): if force: remove(destination) os.symlink(source, destination) - except OSError, e: + except OSError as e: if e.errno != errno.EEXIST or os.readlink(destination) != source: raise @@ -247,7 +247,7 @@ def realpath(file, root, use_physdir = True, loop_cnt = 100, assume_dir = False) file = __realpath_rel(root, file[(len(root) - 1):], root, loop_cnt, assume_dir) else: file = __realpath(file, root, loop_cnt, assume_dir)[0] - except OSError, e: + except OSError as e: if e.errno == errno.ELOOP: # make ELOOP more readable; without catching it, there will # be printed a backtrace with 100s of OSError exceptions diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py index d9848c8e4a..4777ddc06a 100644 --- a/meta/lib/oe/qa.py +++ b/meta/lib/oe/qa.py @@ -106,6 +106,6 @@ class ELFFile: bb.note("%s %s %s" % (objdump, cmd, self.name)) self.objdump_output[cmd] = bb.process.run([objdump, cmd, self.name], env=env, shell=False)[0] return self.objdump_output[cmd] - except Exception, e: + except Exception as e: bb.note("%s %s %s failed: %s" % (objdump, cmd, self.name, e)) return "" diff --git a/meta/lib/oe/types.py b/meta/lib/oe/types.py index ea53df9bf2..5dac9de239 100644 --- a/meta/lib/oe/types.py +++ b/meta/lib/oe/types.py @@ -92,7 +92,7 @@ def regex(value, regexflags=None): try: return re.compile(value, flagval) - except re.error, exc: + except re.error as exc: raise ValueError("Invalid regex value '%s': %s" % (value, exc.args[0])) diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index acd39693b5..ed9409613a 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -1,7 +1,7 @@ def read_file(filename): try: f = file( filename, "r" ) - except IOError, reason: + except IOError as reason: return "" # WARNING: can't raise an error now because of the new RDEPENDS handling. This is a bit ugly. :M: else: return f.read().strip() |