1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-09 05:29:32 +00:00

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.

(From OE-Core rev: 438eabc248f272e3d272aecaa4c9cec177b172d5)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh
2016-06-02 13:12:48 +03:00
committed by Richard Purdie
parent 07c97db272
commit ee31bad762
4 changed files with 14 additions and 14 deletions
+7 -7
View File
@@ -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)