From 6379e5dd27b5fd76939ac7d3a0ba07520451cd90 Mon Sep 17 00:00:00 2001
From: Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Date: Fri, 25 Sep 2009 05:29:02 +0000
Subject: Use list comprehensions instead of filter() or map() in some places
 for compatibility with Python 3.

svn path=/main/trunk/; revision=14421
---
 pym/portage/dbapi/porttree.py | 2 +-
 pym/portage/dbapi/vartree.py  | 2 +-
 pym/portage/tests/__init__.py | 3 ++-
 pym/portage/util.py           | 2 +-
 pym/repoman/utilities.py      | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'pym')

diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index f68d92fd2..eb68ae2b5 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -342,7 +342,7 @@ class portdbapi(dbapi):
 
 		# XXX: REMOVE THIS ONCE UNUSED_0 IS YANKED FROM auxdbkeys
 		# ~harring
-		filtered_auxdbkeys = list(filter(lambda x: not x.startswith("UNUSED_0"), auxdbkeys))
+		filtered_auxdbkeys = [x for x in auxdbkeys if not x.startswith("UNUSED_0")]
 		filtered_auxdbkeys.sort()
 		from portage.cache import metadata_overlay, volatile
 		if not depcachedir_w_ok:
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 90d27dee3..9d1755e9f 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -387,7 +387,7 @@ class LinkageMap(object):
 				for x in filter(None, fields[3].replace(
 				"${ORIGIN}", os.path.dirname(obj)).replace(
 				"$ORIGIN", os.path.dirname(obj)).split(":"))])
-			needed = filter(None, fields[4].split(","))
+			needed = [x for x in fields[4].split(",") if x]
 
 			obj_key = self._obj_key(obj)
 			indexed = True
diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.py
index 6e7380409..9a81d22ff 100644
--- a/pym/portage/tests/__init__.py
+++ b/pym/portage/tests/__init__.py
@@ -176,7 +176,8 @@ class TextTestRunner(unittest.TextTestRunner):
 		self.stream.writeln()
 		if not result.wasSuccessful():
 			self.stream.write("FAILED (")
-			failed, errored = map(len, (result.failures, result.errors))
+			failed = len(result.failures)
+			errored = len(result.errors)
 			if failed:
 				self.stream.write("failures=%d" % failed)
 			if errored:
diff --git a/pym/portage/util.py b/pym/portage/util.py
index df1c1a1e4..3efc2156a 100644
--- a/pym/portage/util.py
+++ b/pym/portage/util.py
@@ -150,7 +150,7 @@ def map_dictlist_vals(func,myDict):
 	new_dl = {}
 	for key in myDict:
 		new_dl[key] = []
-		new_dl[key] = map(func,myDict[key])
+		new_dl[key] = [func(x) for x in myDict[key]]
 	return new_dl
 
 def stack_dictlist(original_dicts, incremental=0, incrementals=[], ignore_none=0):
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index 45160cfc8..5ce386737 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -346,7 +346,7 @@ def FindPortdir(settings):
 	Args:
 		settings - portage.config instance, preferably repoman_settings
 	Returns:
-		tuple(portdir, portdir_overlay, location)
+		list(portdir, portdir_overlay, location)
 	"""
 
 	portdir = None
@@ -430,4 +430,4 @@ def FindPortdir(settings):
 	if not portdir.endswith('/'):
 		portdir += '/'
 
-	return map(normalize_path, (portdir, portdir_overlay, location))
+	return [normalize_path(x) for x in (portdir, portdir_overlay, location)]
-- 
cgit v1.2.3-1-g7c22