[oe-commits] Richard Purdie : clases/lib: Use modern exception syntax
git at git.openembedded.org
git at git.openembedded.org
Thu May 9 08:42:02 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 3439cec880d2d293cf82d8ed82c75942defd8170
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3439cec880d2d293cf82d8ed82c75942defd8170
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Tue May 7 13:55:55 2013 +0100
clases/lib: Use modern exception syntax
Update older code to use modern exception handling syntax which
is the form accepted by python 3.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/base.bbclass | 4 ++--
meta/classes/sanity.bbclass | 6 ++++--
meta/lib/oe/cachedpath.py | 4 ++--
meta/lib/oe/patch.py | 2 +-
meta/lib/oe/path.py | 6 +++---
meta/lib/oe/utils.py | 2 +-
6 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 641316d..196acdb 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/sanity.bbclass b/meta/classes/sanity.bbclass
index ac2314f..766e97e 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 e350c8a..c7860ef 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 7ab74fa..cbc5cd9 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 76a6ed8..d8eb802 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/utils.py b/meta/lib/oe/utils.py
index acd3969..ed94096 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()
More information about the Openembedded-commits
mailing list