From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 1 Mar 2007 23:31:16 +0000 (-0000)
Subject: Fix the rest of the broken except statement syntax.
X-Git-Tag: v2.2_pre1~1630
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0fd6bf65eaa5a3f261d9f338c1edbaeeb8f82c64;p=portage.git

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 b5d15408f..256140df5 100644
--- 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 066a96117..e619db0ac 100644
--- 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