[gentoo-commits] proj/gentoopm:master commit in: gentoopm/portagepm/, gentoopm/paludispm/

["Michał Górny" <mgorny@gentoo.org>]

commit:     4e862d470e99c990243f9ef91a76528c81f691e7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 10:53:52 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 10:53:52 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=4e862d47

Python3: replace itertools.imap() with map().

---
 gentoopm/paludispm/pkg.py |    5 ++---
 gentoopm/portagepm/pkg.py |    7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py
index 5acf362..4f9e874 100644
--- a/gentoopm/paludispm/pkg.py
+++ b/gentoopm/paludispm/pkg.py
@@ -3,7 +3,6 @@
 # (c) 2011 Michał Górny <mgorny@gentoo.org>
 # Released under the terms of the 2-clause BSD license.
 
-import itertools
 import paludis
 
 from ..basepm.depend import PMRequiredUseAtom
@@ -138,12 +137,12 @@ class PaludisID(PMPackage, PaludisAtom):
 	@property
 	def homepages(self):
 		spec = self._get_meta(self._pkg.homepage_key())
-		return SpaceSepTuple(itertools.imap(str, spec))
+		return SpaceSepTuple(map(str, spec))
 
 	@property
 	def keywords(self):
 		kws = self._get_meta(self._pkg.keywords_key())
-		return SpaceSepFrozenSet(itertools.imap(str, kws))
+		return SpaceSepFrozenSet(map(str, kws))
 
 	@property
 	def slot(self):

diff --git a/gentoopm/portagepm/pkg.py b/gentoopm/portagepm/pkg.py
index dbdf77e..0a1399d 100644
--- a/gentoopm/portagepm/pkg.py
+++ b/gentoopm/portagepm/pkg.py
@@ -3,7 +3,6 @@
 # (c) 2011 Michał Górny <mgorny@gentoo.org>
 # Released under the terms of the 2-clause BSD license.
 
-import itertools
 from portage.versions import cpv_getkey, cpv_getversion, vercmp
 
 from ..basepm.depend import PMRequiredUseAtom
@@ -106,7 +105,7 @@ class PortageDBCPV(PMPackage, CompletePortageAtom):
 		return PortagePackageVersion(self._cpv)
 
 	def _aux_get(self, *keys):
-		val = itertools.imap(str, self._dbapi.aux_get(self._cpv, keys))
+		val = map(str, self._dbapi.aux_get(self._cpv, keys))
 		if len(keys) == 1:
 			return next(iter(val))
 		else:
@@ -236,8 +235,8 @@ class PortageCPV(PortageDBCPV, PMInstallablePackage):
 		return self._dbapi.getRepositoryName(self._tree)
 
 	def _aux_get(self, *keys):
-		val = itertools.imap(str, self._dbapi.aux_get(self._cpv,
-				keys, mytree = self._tree))
+		val = map(str, self._dbapi.aux_get(self._cpv, keys,
+				mytree = self._tree))
 		if len(keys) == 1:
 			return next(iter(val))
 		else: