mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-05 20:27:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

clases/lib: Use modern exception syntax

Browse Source 
Update older code to use modern exception handling syntax which
is the form accepted by python 3.

(From OE-Core rev: b010501cd089e649a68f683be0cf4d0aac90fbe3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2013-05-07 13:55:55 +01:00
parent 00052fe695
commit 2ac4f8b397
9 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/classes/base.bbclass
View File

@@ -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)
}

6
meta/classes/package.bbclass
View File

@@ -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

6
meta/classes/sanity.bbclass
View File

@@ -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 ""