diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-06-02 13:12:48 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-02 11:45:58 +0100 |
commit | 438eabc248f272e3d272aecaa4c9cec177b172d5 (patch) | |
tree | 5be184533b66ee841de8dfe9f455382886e7b867 /scripts | |
parent | 874a269eb1d70060c2f3b3f8b70800e2aea789f4 (diff) | |
download | openembedded-core-contrib-438eabc248f272e3d272aecaa4c9cec177b172d5.tar.gz |
scripts: python3: use new style except statement
Changed old syle except statements 'except <exception>, var'
to new style 'except <exception> as var' as old style is not
supported in python3.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/combo-layer | 4 | ||||
-rwxr-xr-x | scripts/contrib/bbvars.py | 14 | ||||
-rwxr-xr-x | scripts/cp-noerror | 8 | ||||
-rwxr-xr-x | scripts/tiny/ksize.py | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index 7c41f92744b..0644cdc0733 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer @@ -190,7 +190,7 @@ def runcmd(cmd,destdir=None,printerr=True,out=None,env=None): err = os.tmpfile() try: subprocess.check_call(cmd, stdout=out, stderr=err, cwd=destdir, shell=isinstance(cmd, str), env=env or os.environ) - except subprocess.CalledProcessError,e: + except subprocess.CalledProcessError as e: err.seek(0) if printerr: logger.error("%s" % err.read()) @@ -429,7 +429,7 @@ file_exclude = %s''' % (name, file_filter or '<empty>', repo.get('file_exclude', runcmd('git replace --graft %s %s' % (start, startrev)) try: runcmd(merge) - except Exception, error: + except Exception as error: logger.info('''Merging component repository history failed, perhaps because of merge conflicts. It may be possible to commit anyway after resolving these conflicts. diff --git a/scripts/contrib/bbvars.py b/scripts/contrib/bbvars.py index 6f479355ebf..b865dd1face 100755 --- a/scripts/contrib/bbvars.py +++ b/scripts/contrib/bbvars.py @@ -37,9 +37,9 @@ def recipe_bbvars(recipe): vset = set() try: r = open(recipe) - except IOError as (errno, strerror): + except IOError as err: print('WARNING: Failed to open recipe ', recipe) - print(strerror) + print(err.args[1]) for line in r: # Strip any comments from the line @@ -71,9 +71,9 @@ def bbvar_is_documented(var, docfiles): for doc in docfiles: try: f = open(doc) - except IOError as (errno, strerror): + except IOError as err: print('WARNING: Failed to open doc ', doc) - print(strerror) + print(err.args[1]) for line in f: if prog.match(line): return True @@ -87,8 +87,8 @@ def bbvar_doctag(var, docconf): try: f = open(docconf) - except IOError as (errno, strerror): - return strerror + except IOError as err: + return err.args[1] for line in f: m = prog.search(line) @@ -109,7 +109,7 @@ def main(): # Collect and validate input try: opts, args = getopt.getopt(sys.argv[1:], "d:hm:t:T", ["help"]) - except getopt.GetoptError, err: + except getopt.GetoptError as err: print('%s' % str(err)) usage() sys.exit(2) diff --git a/scripts/cp-noerror b/scripts/cp-noerror index 28eb90d4a05..d8be6774c71 100755 --- a/scripts/cp-noerror +++ b/scripts/cp-noerror @@ -33,16 +33,16 @@ def copytree(src, dst, symlinks=False, ignore=None): shutil.copy2(srcname, dstname) # catch the Error from the recursive copytree so that we can # continue with other files - except shutil.Error, err: + except shutil.Error as err: errors.extend(err.args[0]) - except EnvironmentError, why: + except EnvironmentError as why: errors.append((srcname, dstname, str(why))) try: shutil.copystat(src, dst) - except OSError, why: + except OSError as why: errors.extend((src, dst, str(why))) if errors: - raise shutil.Error, errors + raise shutil.Error(errors) try: copytree(sys.argv[1], sys.argv[2]) diff --git a/scripts/tiny/ksize.py b/scripts/tiny/ksize.py index 275c983b8d7..54b71f8e074 100755 --- a/scripts/tiny/ksize.py +++ b/scripts/tiny/ksize.py @@ -133,7 +133,7 @@ class Report: def main(): try: opts, args = getopt.getopt(sys.argv[1:], "dh", ["help"]) - except getopt.GetoptError, err: + except getopt.GetoptError as err: print('%s' % str(err)) usage() sys.exit(2) |