Update syntax of 'except' statements for compatibility with Python 3.

(2to3-3.1 -f except -nw ${FILES})

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

18 files changed, 73 insertions, 73 deletions

diff --git a/pym/_emerge/BinpkgVerifier.py b/pym/_emerge/BinpkgVerifier.py
index 36e1bb8b6..404becf09 100644
--- a/pym/_emerge/BinpkgVerifier.py
+++ b/pym/_emerge/BinpkgVerifier.py
@@ -42,7 +42,7 @@ class BinpkgVerifier(AsynchronousTask):
 				writemsg("!!! Fetching Binary failed " + \
 					"for '%s'\n" % pkg.cpv, noiselevel=-1)
 				rval = 1
-			except portage.exception.DigestException, e:
+			except portage.exception.DigestException as e:
 				writemsg("\n!!! Digest verification failed:\n",
 					noiselevel=-1)
 				writemsg("!!! %s\n" % e.value[0],
diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py
index 2af47ca85..db16fa83a 100644
--- a/pym/_emerge/BlockerCache.py
+++ b/pym/_emerge/BlockerCache.py
@@ -55,7 +55,7 @@ class BlockerCache(portage.cache.mappings.MutableMapping):
 			self._cache_data = mypickle.load()
 			f.close()
 			del f
-		except (IOError, OSError, EOFError, ValueError, pickle.UnpicklingError), e:
+		except (IOError, OSError, EOFError, ValueError, pickle.UnpicklingError) as e:
 			if isinstance(e, pickle.UnpicklingError):
 				writemsg("!!! Error loading '%s': %s\n" % \
 					(self._cache_filename, str(e)), noiselevel=-1)
@@ -140,7 +140,7 @@ class BlockerCache(portage.cache.mappings.MutableMapping):
 				f.close()
 				portage.util.apply_secpass_permissions(
 					self._cache_filename, gid=portage.portage_gid, mode=0644)
-			except (IOError, OSError), e:
+			except (IOError, OSError) as e:
 				pass
 			self._modified.clear()
 
diff --git a/pym/_emerge/EbuildBuildDir.py b/pym/_emerge/EbuildBuildDir.py
index d9f819966..d856d1912 100644
--- a/pym/_emerge/EbuildBuildDir.py
+++ b/pym/_emerge/EbuildBuildDir.py
@@ -83,7 +83,7 @@ class EbuildBuildDir(SlotObject):
 			if catdir_lock:
 				try:
 					os.rmdir(catdir)
-				except OSError, e:
+				except OSError as e:
 					if e.errno not in (errno.ENOENT,
 						errno.ENOTEMPTY, errno.EEXIST):
 						raise
diff --git a/pym/_emerge/EbuildFetchonly.py b/pym/_emerge/EbuildFetchonly.py
index d65e2b2b1..256a06c69 100644
--- a/pym/_emerge/EbuildFetchonly.py
+++ b/pym/_emerge/EbuildFetchonly.py
@@ -44,7 +44,7 @@ class EbuildFetchonly(SlotObject):
 		from tempfile import mkdtemp
 		try:
 			private_tmpdir = mkdtemp("", "._portage_fetch_.", global_tmpdir)
-		except OSError, e:
+		except OSError as e:
 			if e.errno != portage.exception.PermissionDenied.errno:
 				raise
 			raise portage.exception.PermissionDenied(global_tmpdir)
diff --git a/pym/_emerge/MetadataRegen.py b/pym/_emerge/MetadataRegen.py
index ee6eb997a..4c237d34c 100644
--- a/pym/_emerge/MetadataRegen.py
+++ b/pym/_emerge/MetadataRegen.py
@@ -90,7 +90,7 @@ class MetadataRegen(PollScheduler):
 			for mytree in portdb.porttrees:
 				try:
 					dead_nodes[mytree] = set(portdb.auxdb[mytree].iterkeys())
-				except CacheError, e:
+				except CacheError as e:
 					portage.writemsg("Error listing cache entries for " + \
 						"'%s': %s, continuing...\n" % (mytree, e),
 						noiselevel=-1)
@@ -105,7 +105,7 @@ class MetadataRegen(PollScheduler):
 					dead_nodes[mytree] = set(cpv for cpv in \
 						portdb.auxdb[mytree].iterkeys() \
 						if cpv_getkey(cpv) in cp_set)
-				except CacheError, e:
+				except CacheError as e:
 					portage.writemsg("Error listing cache entries for " + \
 						"'%s': %s, continuing...\n" % (mytree, e),
 						noiselevel=-1)
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index b1d4a11b3..a38edbd0d 100644
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -195,7 +195,7 @@ class _PackageMetadataWrapper(dict):
 			elif k in self._use_conditional_keys:
 				try:
 					use_reduce(paren_reduce(v), matchall=1)
-				except portage.exception.InvalidDependString, e:
+				except portage.exception.InvalidDependString as e:
 					self._pkg._invalid_metadata(k + ".syntax", "%s: %s" % (k, e))
 
 	def __getitem__(self, k):
diff --git a/pym/_emerge/PackageUninstall.py b/pym/_emerge/PackageUninstall.py
index fdd59e149..59bb50e56 100644
--- a/pym/_emerge/PackageUninstall.py
+++ b/pym/_emerge/PackageUninstall.py
@@ -23,7 +23,7 @@ class PackageUninstall(AsynchronousTask):
 				[self.pkg.cpv], self.ldpath_mtimes, clean_world=0,
 				clean_delay=0, raise_on_error=1, scheduler=self.scheduler,
 				writemsg_level=self._writemsg_level)
-		except UninstallFailure, e:
+		except UninstallFailure as e:
 			self.returncode = e.status
 		else:
 			self.returncode = os.EX_OK
diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py
index 8250cb00a..e04b58ae7 100644
--- a/pym/_emerge/PollScheduler.py
+++ b/pym/_emerge/PollScheduler.py
@@ -95,7 +95,7 @@ class PollScheduler(object):
 			try:
 				self._poll_event_queue.extend(self._poll_obj.poll(timeout))
 				break
-			except select.error, e:
+			except select.error as e:
 				writemsg_level("\n!!! select error: %s\n" % (e,),
 					level=logging.ERROR, noiselevel=-1)
 				del e
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 06074c932..d532335e6 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -1498,7 +1498,7 @@ class Scheduler(PollScheduler):
 			success, mydepgraph, dropped_tasks = resume_depgraph(
 				self.settings, self.trees, self._mtimedb, self.myopts,
 				myparams, self._spinner)
-		except depgraph.UnsatisfiedResumeDep, exc:
+		except depgraph.UnsatisfiedResumeDep as exc:
 			# rename variable to avoid python-3.0 error:
 			# SyntaxError: can not delete variable 'e' referenced in nested
 			#              scope
diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py
index e6b3cc7a0..70d3ff11d 100644
--- a/pym/_emerge/SpawnProcess.py
+++ b/pym/_emerge/SpawnProcess.py
@@ -157,7 +157,7 @@ class SpawnProcess(SubProcess):
 								write_successful = True
 							files.stdout.flush()
 							break
-						except IOError, e:
+						except IOError as e:
 							if e.errno != errno.EAGAIN:
 								raise
 							del e
diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py
index 6bd4562d4..0df94b9e7 100644
--- a/pym/_emerge/SubProcess.py
+++ b/pym/_emerge/SubProcess.py
@@ -27,7 +27,7 @@ class SubProcess(AbstractPollTask):
 
 		try:
 			retval = os.waitpid(self.pid, os.WNOHANG)
-		except OSError, e:
+		except OSError as e:
 			if e.errno != errno.ECHILD:
 				raise
 			del e
@@ -42,7 +42,7 @@ class SubProcess(AbstractPollTask):
 		if self.isAlive():
 			try:
 				os.kill(self.pid, signal.SIGTERM)
-			except OSError, e:
+			except OSError as e:
 				if e.errno != errno.ESRCH:
 					raise
 				del e
@@ -69,7 +69,7 @@ class SubProcess(AbstractPollTask):
 
 		try:
 			wait_retval = os.waitpid(self.pid, 0)
-		except OSError, e:
+		except OSError as e:
 			if e.errno != errno.ECHILD:
 				raise
 			del e
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index e1f7ffe19..9de19cfbd 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -204,7 +204,7 @@ def action_build(settings, trees, mtimedb,
 			success, mydepgraph, dropped_tasks = resume_depgraph(
 				settings, trees, mtimedb, myopts, myparams, spinner)
 		except (portage.exception.PackageNotFound,
-			depgraph.UnsatisfiedResumeDep), e:
+			depgraph.UnsatisfiedResumeDep) as e:
 			if isinstance(e, depgraph.UnsatisfiedResumeDep):
 				mydepgraph = e.depgraph
 			if show_spinner:
@@ -298,7 +298,7 @@ def action_build(settings, trees, mtimedb,
 		try:
 			success, mydepgraph, favorites = backtrack_depgraph(
 				settings, trees, myopts, myparams, myaction, myfiles, spinner)
-		except portage.exception.PackageSetNotFound, e:
+		except portage.exception.PackageSetNotFound as e:
 			if show_spinner:
 				print "\b\b... done!"
 			root_config = trees[settings["ROOT"]]["root_config"]
@@ -484,7 +484,7 @@ def action_config(settings, trees, myopts, myfiles):
 	print
 	try:
 		pkgs = trees[settings["ROOT"]]["vartree"].dbapi.match(myfiles[0])
-	except portage.exception.AmbiguousPackageName, e:
+	except portage.exception.AmbiguousPackageName as e:
 		# Multiple matches thrown from cpv_expand
 		pkgs = e.args[0]
 	if len(pkgs) == 0:
@@ -682,7 +682,7 @@ def calc_depclean(settings, trees, ldpath_mtimes,
 					if args_set.findAtomForPackage(pkg) is None:
 						world_temp_set.add("=" + pkg.cpv)
 						continue
-				except portage.exception.InvalidDependString, e:
+				except portage.exception.InvalidDependString as e:
 					show_invalid_depstring_notice(pkg,
 						pkg.metadata["PROVIDE"], str(e))
 					del e
@@ -731,7 +731,7 @@ def calc_depclean(settings, trees, ldpath_mtimes,
 				if args_set.findAtomForPackage(pkg) is None:
 					world_temp_set.add("=" + pkg.cpv)
 					continue
-			except portage.exception.InvalidDependString, e:
+			except portage.exception.InvalidDependString as e:
 				show_invalid_depstring_notice(pkg,
 					pkg.metadata["PROVIDE"], str(e))
 				del e
@@ -1531,11 +1531,11 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
 				tree_data.valid_nodes.add(cpv)
 				try:
 					src = tree_data.src_db[cpv]
-				except KeyError, e:
+				except KeyError as e:
 					noise.missing_entry(cpv)
 					del e
 					continue
-				except CacheError, ce:
+				except CacheError as ce:
 					noise.exception(cpv, ce)
 					del ce
 					continue
@@ -1585,7 +1585,7 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
 				try:
 					inherited = src.get('INHERITED', '')
 					eclasses = src.get('_eclasses_')
-				except CacheError, ce:
+				except CacheError as ce:
 					noise.exception(cpv, ce)
 					del ce
 					continue
@@ -1630,7 +1630,7 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
 
 				try:
 					tree_data.dest_db[cpv] = src
-				except CacheError, ce:
+				except CacheError as ce:
 					noise.exception(cpv, ce)
 					del ce
 
@@ -1644,7 +1644,7 @@ def action_metadata(settings, portdb, myopts, porttrees=None):
 	for tree_data in porttrees_data:
 		try:
 			dead_nodes = set(tree_data.dest_db.iterkeys())
-		except CacheError, e:
+		except CacheError as e:
 			writemsg_level("Error listing cache entries for " + \
 				"'%s': %s, continuing...\n" % (tree_data.path, e),
 				level=logging.ERROR, noiselevel=-1)
@@ -1673,7 +1673,7 @@ def action_regen(settings, portdb, max_jobs, max_load):
 	portage.writemsg_stdout("Regenerating cache entries...\n")
 	try:
 		os.close(sys.stdin.fileno())
-	except SystemExit, e:
+	except SystemExit as e:
 		raise # Needed else can't exit
 	except:
 		pass
@@ -1696,7 +1696,7 @@ def action_search(root_config, myopts, myfiles, spinner):
 		for mysearch in myfiles:
 			try:
 				searchinstance.execute(mysearch)
-			except re.error, comment:
+			except re.error as comment:
 				print "\n!!! Regular expression error in \"%s\": %s" % ( mysearch, comment )
 				sys.exit(1)
 			searchinstance.output()
@@ -1888,7 +1888,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 
 		try:
 			maxretries=int(settings["PORTAGE_RSYNC_RETRIES"])
-		except SystemExit, e:
+		except SystemExit as e:
 			raise # Needed else can't exit
 		except:
 			maxretries=3 #default number of retries
@@ -1928,9 +1928,9 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 							ips.append(addrinfo[4][0])
 					from random import shuffle
 					shuffle(ips)
-				except SystemExit, e:
+				except SystemExit as e:
 					raise # Needed else can't exit
-				except Exception, e:
+				except Exception as e:
 					print "Notice:",str(e)
 					dosyncuri=syncuri
 
@@ -1939,9 +1939,9 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 					dosyncuri = syncuri.replace(
 						"//" + user_name + hostname + port + "/",
 						"//" + user_name + ips[0] + port + "/", 1)
-				except SystemExit, e:
+				except SystemExit as e:
 					raise # Needed else can't exit
-				except Exception, e:
+				except Exception as e:
 					print "Notice:",str(e)
 					dosyncuri=syncuri
 
@@ -2008,7 +2008,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 							os.unlink(tmpservertimestampfile)
 						except OSError:
 							pass
-				except portage.exception.PortageException, e:
+				except portage.exception.PortageException as e:
 					# timed out
 					print e
 					del e
@@ -2129,7 +2129,7 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 				sys.exit(1)
 			try:
 				os.rmdir(myportdir)
-			except OSError, e:
+			except OSError as e:
 				if e.errno != errno.ENOENT:
 					sys.stderr.write(
 						"!!! existing '%s' directory; exiting.\n" % myportdir)
@@ -2224,7 +2224,7 @@ def action_uninstall(settings, trees, ldpath_mtimes,
 			try:
 				valid_atoms.append(
 					portage.dep_expand(x, mydb=vardb, settings=settings))
-			except portage.exception.AmbiguousPackageName, e:
+			except portage.exception.AmbiguousPackageName as e:
 				msg = "The short ebuild name \"" + x + \
 					"\" is ambiguous.  Please specify " + \
 					"one of the following " + \
@@ -2326,7 +2326,7 @@ def adjust_config(myopts, settings):
 	CLEAN_DELAY = 5
 	try:
 		CLEAN_DELAY = int(settings.get("CLEAN_DELAY", str(CLEAN_DELAY)))
-	except ValueError, e:
+	except ValueError as e:
 		portage.writemsg("!!! %s\n" % str(e), noiselevel=-1)
 		portage.writemsg("!!! Unable to parse integer: CLEAN_DELAY='%s'\n" % \
 			settings["CLEAN_DELAY"], noiselevel=-1)
@@ -2337,7 +2337,7 @@ def adjust_config(myopts, settings):
 	try:
 		EMERGE_WARNING_DELAY = int(settings.get(
 			"EMERGE_WARNING_DELAY", str(EMERGE_WARNING_DELAY)))
-	except ValueError, e:
+	except ValueError as e:
 		portage.writemsg("!!! %s\n" % str(e), noiselevel=-1)
 		portage.writemsg("!!! Unable to parse integer: EMERGE_WARNING_DELAY='%s'\n" % \
 			settings["EMERGE_WARNING_DELAY"], noiselevel=-1)
@@ -2367,7 +2367,7 @@ def adjust_config(myopts, settings):
 			portage.writemsg("!!! PORTAGE_DEBUG must be either 0 or 1\n",
 				noiselevel=-1)
 			PORTAGE_DEBUG = 0
-	except ValueError, e:
+	except ValueError as e:
 		portage.writemsg("!!! %s\n" % str(e), noiselevel=-1)
 		portage.writemsg("!!! Unable to parse integer: PORTAGE_DEBUG='%s'\n" %\
 			settings["PORTAGE_DEBUG"], noiselevel=-1)
@@ -2458,7 +2458,7 @@ def git_sync_timestamps(settings, portdir):
 	try:
 		cache_db = settings.load_best_module("portdbapi.metadbmodule")(
 			portdir, "metadata/cache", portage.auxdbkeys[:], readonly=True)
-	except CacheError, e:
+	except CacheError as e:
 		writemsg_level("!!! Unable to instantiate cache: %s\n" % (e,),
 			level=logging.ERROR, noiselevel=-1)
 		return 1
@@ -2467,7 +2467,7 @@ def git_sync_timestamps(settings, portdir):
 	try:
 		ec_names = set(f[:-7] for f in os.listdir(ec_dir) \
 			if f.endswith(".eclass"))
-	except OSError, e:
+	except OSError as e:
 		writemsg_level("!!! Unable to list eclasses: %s\n" % (e,),
 			level=logging.ERROR, noiselevel=-1)
 		return 1
@@ -2508,7 +2508,7 @@ def git_sync_timestamps(settings, portdir):
 			writemsg_level("!!! Missing cache entry: %s\n" % (cpv,),
 				level=logging.ERROR, noiselevel=-1)
 			continue
-		except CacheError, e:
+		except CacheError as e:
 			writemsg_level("!!! Unable to access cache entry: %s %s\n" % \
 				(cpv, e), level=logging.ERROR, noiselevel=-1)
 			continue
diff --git a/pym/_emerge/changelog.py b/pym/_emerge/changelog.py
index 0fdf5880a..2391a92ab 100644
--- a/pym/_emerge/changelog.py
+++ b/pym/_emerge/changelog.py
@@ -25,7 +25,7 @@ def calc_changelog(ebuildpath,current,next):
 			encoding=_encodings['fs'], errors='strict'),
 			mode='r', encoding=_encodings['repo.content'], errors='replace'
 		).read()
-	except SystemExit, e:
+	except SystemExit as e:
 		raise # Needed else can't exit
 	except:
 		return []
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index e4affdf37..ea7d1b305 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -792,7 +792,7 @@ class depgraph(object):
 		if True:
 			try:
 				arg_atoms = list(self._iter_atoms_for_pkg(pkg))
-			except portage.exception.InvalidDependString, e:
+			except portage.exception.InvalidDependString as e:
 				if not pkg.installed:
 					show_invalid_depstring_notice(
 						pkg, pkg.metadata["PROVIDE"], str(e))
@@ -931,7 +931,7 @@ class depgraph(object):
 					settings.unlock()
 					settings.setinst(pkg.cpv, pkg.metadata)
 					settings.lock()
-				except portage.exception.InvalidDependString, e:
+				except portage.exception.InvalidDependString as e:
 					show_invalid_depstring_notice(
 						pkg, pkg.metadata["PROVIDE"], str(e))
 					del e
@@ -1079,7 +1079,7 @@ class depgraph(object):
 					dep_string = list(self._queue_disjunctive_deps(
 						pkg, dep_root, dep_priority, dep_string))
 
-				except portage.exception.InvalidDependString, e:
+				except portage.exception.InvalidDependString as e:
 					if pkg.installed:
 						del e
 						continue
@@ -1096,7 +1096,7 @@ class depgraph(object):
 					allow_unsatisfied):
 					return 0
 
-		except portage.exception.AmbiguousPackageName, e:
+		except portage.exception.AmbiguousPackageName as e:
 			pkgs = e.args[0]
 			portage.writemsg("\n\n!!! An atom in the dependencies " + \
 				"is not fully-qualified. Multiple matches:\n\n", noiselevel=-1)
@@ -1135,7 +1135,7 @@ class depgraph(object):
 			selected_atoms = self._select_atoms(dep_root,
 				dep_string, myuse=pkg.use.enabled, parent=pkg,
 				strict=strict, priority=dep_priority)
-		except portage.exception.InvalidDependString, e:
+		except portage.exception.InvalidDependString as e:
 			show_invalid_depstring_notice(pkg, dep_string, str(e))
 			del e
 			if pkg.installed:
@@ -1678,23 +1678,23 @@ class depgraph(object):
 								"dependencies for %s\n") % atom)
 						return 0, myfavorites
 
-				except portage.exception.MissingSignature, e:
+				except portage.exception.MissingSignature as e:
 					portage.writemsg("\n\n!!! A missing gpg signature is preventing portage from calculating the\n")
 					portage.writemsg("!!! required dependencies. This is a security feature enabled by the admin\n")
 					portage.writemsg("!!! to aid in the detection of malicious intent.\n\n")
 					portage.writemsg("!!! THIS IS A POSSIBLE INDICATION OF TAMPERED FILES -- CHECK CAREFULLY.\n")
 					portage.writemsg("!!! Affected file: %s\n" % (e), noiselevel=-1)
 					return 0, myfavorites
-				except portage.exception.InvalidSignature, e:
+				except portage.exception.InvalidSignature as e:
 					portage.writemsg("\n\n!!! An invalid gpg signature is preventing portage from calculating the\n")
 					portage.writemsg("!!! required dependencies. This is a security feature enabled by the admin\n")
 					portage.writemsg("!!! to aid in the detection of malicious intent.\n\n")
 					portage.writemsg("!!! THIS IS A POSSIBLE INDICATION OF TAMPERED FILES -- CHECK CAREFULLY.\n")
 					portage.writemsg("!!! Affected file: %s\n" % (e), noiselevel=-1)
 					return 0, myfavorites
-				except SystemExit, e:
+				except SystemExit as e:
 					raise # Needed else can't exit
-				except Exception, e:
+				except Exception as e:
 					print >> sys.stderr, "\n\n!!! Problem in '%s' dependencies." % atom
 					print >> sys.stderr, "!!!", str(e), getattr(e, "__module__", None)
 					raise
@@ -2648,7 +2648,7 @@ class depgraph(object):
 								success, atoms = portage.dep_check(depstr,
 									final_db, pkgsettings, myuse=pkg.use.enabled,
 									trees=self._dynamic_config._graph_trees, myroot=myroot)
-							except Exception, e:
+							except Exception as e:
 								if isinstance(e, SystemExit):
 									raise
 								# This is helpful, for example, if a ValueError
@@ -2684,7 +2684,7 @@ class depgraph(object):
 								blocker = Blocker(atom=portage.dep.Atom(atom),
 									eapi=pkg.metadata["EAPI"], root=myroot)
 								self._dynamic_config._blocker_parents.add(blocker, pkg)
-						except portage.exception.InvalidAtom, e:
+						except portage.exception.InvalidAtom as e:
 							depstr = " ".join(vardb.aux_get(pkg.cpv, dep_keys))
 							show_invalid_depstring_notice(
 								pkg, depstr, "Invalid Atom: %s" % (e,))
@@ -3055,7 +3055,7 @@ class depgraph(object):
 					running_root, running_portage.metadata["RDEPEND"],
 					myuse=running_portage.use.enabled,
 					parent=running_portage, strict=False)
-			except portage.exception.InvalidDependString, e:
+			except portage.exception.InvalidDependString as e:
 				portage.writemsg("!!! Invalid RDEPEND in " + \
 					"'%svar/db/pkg/%s/RDEPEND': %s\n" % \
 					(running_root, running_portage.cpv, e), noiselevel=-1)
@@ -3291,7 +3291,7 @@ class depgraph(object):
 						try:
 							runtime_dep_atoms = \
 								list(runtime_deps.iterAtomsForPackage(task))
-						except portage.exception.InvalidDependString, e:
+						except portage.exception.InvalidDependString as e:
 							portage.writemsg("!!! Invalid PROVIDE in " + \
 								"'%svar/db/pkg/%s/PROVIDE': %s\n" % \
 								(task.root, task.cpv, e), noiselevel=-1)
@@ -3326,7 +3326,7 @@ class depgraph(object):
 								"system"].iterAtomsForPackage(task):
 								skip = True
 								break
-						except portage.exception.InvalidDependString, e:
+						except portage.exception.InvalidDependString as e:
 							portage.writemsg("!!! Invalid PROVIDE in " + \
 								"'%svar/db/pkg/%s/PROVIDE': %s\n" % \
 								(task.root, task.cpv, e), noiselevel=-1)
@@ -3361,7 +3361,7 @@ class depgraph(object):
 									skip = True
 									self._dynamic_config._blocked_world_pkgs[inst_pkg] = atom
 									break
-						except portage.exception.InvalidDependString, e:
+						except portage.exception.InvalidDependString as e:
 							portage.writemsg("!!! Invalid PROVIDE in " + \
 								"'%svar/db/pkg/%s/PROVIDE': %s\n" % \
 								(task.root, task.cpv, e), noiselevel=-1)
@@ -4196,7 +4196,7 @@ class depgraph(object):
 						try:
 							myfilesdict = portdb.getfetchsizes(pkg_key,
 								useflags=pkg_use, debug=self._frozen_config.edebug)
-						except portage.exception.InvalidDependString, e:
+						except portage.exception.InvalidDependString as e:
 							src_uri = portdb.aux_get(pkg_key, ["SRC_URI"])[0]
 							show_invalid_depstring_notice(x, src_uri, str(e))
 							del e
@@ -4252,7 +4252,7 @@ class depgraph(object):
 				if "COLUMNWIDTH" in self._frozen_config.settings:
 					try:
 						mywidth = int(self._frozen_config.settings["COLUMNWIDTH"])
-					except ValueError, e:
+					except ValueError as e:
 						portage.writemsg("!!! %s\n" % str(e), noiselevel=-1)
 						portage.writemsg(
 							"!!! Unable to parse COLUMNWIDTH='%s'\n" % \
@@ -4601,7 +4601,7 @@ class depgraph(object):
 					if myfavkey in added_favorites:
 						continue
 					added_favorites.add(myfavkey)
-			except portage.exception.InvalidDependString, e:
+			except portage.exception.InvalidDependString as e:
 				writemsg("\n\n!!! '%s' has invalid PROVIDE: %s\n" % \
 					(pkg_key, str(e)), noiselevel=-1)
 				writemsg("!!! see '%s'\n\n" % os.path.join(
@@ -5080,7 +5080,7 @@ def resume_depgraph(settings, trees, mtimedb, myopts, myparams, spinner):
 		try:
 			success = mydepgraph._loadResumeCommand(mtimedb["resume"],
 				skip_masked=skip_masked)
-		except depgraph.UnsatisfiedResumeDep, e:
+		except depgraph.UnsatisfiedResumeDep as e:
 			if not skip_unsatisfied:
 				raise
 
diff --git a/pym/_emerge/emergelog.py b/pym/_emerge/emergelog.py
index cdc60767b..4e9a2e93e 100644
--- a/pym/_emerge/emergelog.py
+++ b/pym/_emerge/emergelog.py
@@ -46,6 +46,6 @@ def emergelog(xterm_titles, mystr, short_msg=None):
 			if mylock:
 				portage.locks.unlockfile(mylock)
 			mylogfile.close()
-	except (IOError,OSError,portage.exception.PortageException), e:
+	except (IOError,OSError,portage.exception.PortageException) as e:
 		if secpass >= 1:
 			print >> sys.stderr, "emergelog():",e
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index 6307904b7..0df815a02 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -137,7 +137,7 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval):
 							try:
 								os.rename(dir_file + ext, dir_file + ext + ".old")
 								moved_old_dir = True
-							except EnvironmentError, e:
+							except EnvironmentError as e:
 								if e.errno != errno.ENOENT:
 									raise
 								del e
@@ -164,7 +164,7 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval):
 					for ext in dir_extensions:
 						try:
 							os.rename(dir_file + ext + ".old", dir_file + ext)
-						except EnvironmentError, e:
+						except EnvironmentError as e:
 							if e.errno != errno.ENOENT:
 								raise
 							del e
@@ -174,7 +174,7 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval):
 				for ext in dir_extensions:
 					try:
 						os.unlink(dir_file + ext + ".old")
-					except EnvironmentError, e:
+					except EnvironmentError as e:
 						if e.errno != errno.ENOENT:
 							raise
 						del e
@@ -213,7 +213,7 @@ def display_preserved_libs(vardbapi, myopts):
 
 		try:
 			linkmap.rebuild()
-		except portage.exception.CommandNotFound, e:
+		except portage.exception.CommandNotFound as e:
 			writemsg_level("!!! Command Not Found: %s\n" % (e,),
 				level=logging.ERROR, noiselevel=-1)
 			del e
@@ -783,7 +783,7 @@ def apply_priorities(settings):
 def nice(settings):
 	try:
 		os.nice(int(settings.get("PORTAGE_NICENESS", "0")))
-	except (OSError, ValueError), e:
+	except (OSError, ValueError) as e:
 		out = portage.output.EOutput()
 		out.eerror("Failed to change nice value to '%s'" % \
 			settings["PORTAGE_NICENESS"])
@@ -910,7 +910,7 @@ def expand_set_arguments(myfiles, myaction, root_config):
 				setconfig.active.append(s)
 				try:
 					set_atoms = setconfig.getSetAtoms(s)
-				except portage.exception.PackageSetNotFound, e:
+				except portage.exception.PackageSetNotFound as e:
 					writemsg_level(("emerge: the given set '%s' " + \
 						"contains a non-existent set named '%s'.\n") % \
 						(s, e), level=logging.ERROR, noiselevel=-1)
@@ -1281,7 +1281,7 @@ def emerge_main():
 			try:
 				# At least the parent needs to exist for the lock file.
 				portage.util.ensure_dirs(settings['EMERGE_LOG_DIR'])
-			except portage.exception.PortageException, e:
+			except portage.exception.PortageException as e:
 				writemsg_level("!!! Error creating directory for " + \
 					"EMERGE_LOG_DIR='%s':\n!!! %s\n" % \
 					(settings['EMERGE_LOG_DIR'], e),
@@ -1364,7 +1364,7 @@ def emerge_main():
 				try:
 					valid_atoms.append(
 						portage.dep_expand(x, mydb=vardb, settings=settings))
-				except portage.exception.AmbiguousPackageName, e:
+				except portage.exception.AmbiguousPackageName as e:
 					msg = "The short ebuild name \"" + x + \
 						"\" is ambiguous.  Please specify " + \
 						"one of the following " + \
diff --git a/pym/_emerge/search.py b/pym/_emerge/search.py
index 1f276b47e..9f0811dea 100644
--- a/pym/_emerge/search.py
+++ b/pym/_emerge/search.py
@@ -315,13 +315,13 @@ class search(object):
 							pkgdir, self.settings["DISTDIR"])
 						try:
 							uri_map = self.portdb.getFetchMap(mycpv)
-						except portage.exception.InvalidDependString, e:
+						except portage.exception.InvalidDependString as e:
 							file_size_str = "Unknown (%s)" % (e,)
 							del e
 						else:
 							try:
 								mysum[0] = mf.getDistfilesSize(uri_map)
-							except KeyError, e:
+							except KeyError as e:
 								file_size_str = "Unknown (missing " + \
 									"digest for %s)" % (e,)
 								del e
diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index cfa57bbc7..76b379581 100644
--- a/pym/_emerge/unmerge.py
+++ b/pym/_emerge/unmerge.py
@@ -171,7 +171,7 @@ def unmerge(root_config, myopts, unmerge_action,
 			# what will and will not get unmerged
 			try:
 				mymatch = vartree.dbapi.match(x)
-			except portage.exception.AmbiguousPackageName, errpkgs:
+			except portage.exception.AmbiguousPackageName as errpkgs:
 				print "\n\n!!! The short ebuild name \"" + \
 					x + "\" is ambiguous.  Please specify"
 				print "!!! one of the following fully-qualified " + \