Fix the rest of the broken except statement syntax. (trunk r6120:6121)

svn path=/main/branches/2.1.2/; revision=6122

diff --git a/bin/emerge b/bin/emerge
index ed4387cb4c977b448b933b19796850dccafadc79..53d925c418ee54ae3366f079f5055507c63255fc 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3832,7 +3832,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
                        try:
                                mytimestamp = time.mktime(time.strptime(content[0],
                                        "%a, %d %b %Y %H:%M:%S +0000"))
-                       except OverflowError, ValueError:
+                       except (OverflowError, ValueError):
                                pass
                del content
 
@@ -4241,7 +4241,7 @@ def action_regen(settings, portdb):
                        for y in nodes:
                                try:
                                        del auxdb[y]
-                               except KeyError, CacheError:
+                               except (KeyError, CacheError):
                                        pass
        print "done!"
 

diff --git a/pym/cache/fs_template.py b/pym/cache/fs_template.py
index b76e98bd3b8791fe5b4195f30ca3b598d9dadc08..9741ecbcce8afc286d634d43827ee6dd2caee4c1 100644 (file)
--- a/pym/cache/fs_template.py
+++ b/pym/cache/fs_template.py
@@ -39,7 +39,7 @@ class FsBased(template.database):
                        if mtime:
                                mtime=long(mtime)
                                os.utime(path, (mtime, mtime))
-               except OSError, IOError:
+               except (OSError, IOError):
                        return False
                return True