Fix the rest of the broken except statement syntax.

svn path=/main/trunk/; revision=6121

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index b5d15408f1062df725aa5035c66447d93dea9f07..256140df5e5685d022404153f0ee0f575036df56 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -3893,7 +3893,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
 
@@ -4301,7 +4301,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/portage/cache/fs_template.py b/pym/portage/cache/fs_template.py
index 066a96117b8be9899e44eba96e1b6339a0403bca..e619db0ac3c9d9bf44f87b8c6dd15ffffbcb3f6b 100644 (file)
--- a/pym/portage/cache/fs_template.py
+++ b/pym/portage/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