[oe-commits] Richard Purdie : fixup

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 776e1c46674514d12d90e64eb0cc50f6e151a64a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=776e1c46674514d12d90e64eb0cc50f6e151a64a

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Thu May  9 09:38:47 2013 +0100

fixup

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/package.bbclass |    6 ++++--
 meta/lib/oe/qa.py            |    2 +-
 meta/lib/oe/types.py         |    2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 1a8da40..96228b0 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/lib/oe/qa.py b/meta/lib/oe/qa.py
index d9848c8..4777ddc 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 ea53df9..5dac9de 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]))