From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QsBrt-0003X9-3P for garchives@archives.gentoo.org; Sat, 13 Aug 2011 10:55:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8775721C1E4; Sat, 13 Aug 2011 10:54:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 51E0521C1E4 for ; Sat, 13 Aug 2011 10:54:57 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C26A61B4023 for ; Sat, 13 Aug 2011 10:54:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D5F0980040 for ; Sat, 13 Aug 2011 10:54:55 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <4e862d470e99c990243f9ef91a76528c81f691e7.mgorny@gentoo> Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/portagepm/, gentoopm/paludispm/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/paludispm/pkg.py gentoopm/portagepm/pkg.py X-VCS-Directories: gentoopm/portagepm/ gentoopm/paludispm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4e862d470e99c990243f9ef91a76528c81f691e7 Date: Sat, 13 Aug 2011 10:54:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 4614ed47d32fd4aaffee6ff66f5da5db commit: 4e862d470e99c990243f9ef91a76528c81f691e7 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Sat Aug 13 10:53:52 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Sat Aug 13 10:53:52 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3D4e862d47 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=C5=82 G=C3=B3rny # Released under the terms of the 2-clause BSD license. =20 -import itertools import paludis =20 from ..basepm.depend import PMRequiredUseAtom @@ -138,12 +137,12 @@ class PaludisID(PMPackage, PaludisAtom): @property def homepages(self): spec =3D self._get_meta(self._pkg.homepage_key()) - return SpaceSepTuple(itertools.imap(str, spec)) + return SpaceSepTuple(map(str, spec)) =20 @property def keywords(self): kws =3D self._get_meta(self._pkg.keywords_key()) - return SpaceSepFrozenSet(itertools.imap(str, kws)) + return SpaceSepFrozenSet(map(str, kws)) =20 @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=C5=82 G=C3=B3rny # Released under the terms of the 2-clause BSD license. =20 -import itertools from portage.versions import cpv_getkey, cpv_getversion, vercmp =20 from ..basepm.depend import PMRequiredUseAtom @@ -106,7 +105,7 @@ class PortageDBCPV(PMPackage, CompletePortageAtom): return PortagePackageVersion(self._cpv) =20 def _aux_get(self, *keys): - val =3D itertools.imap(str, self._dbapi.aux_get(self._cpv, keys)) + val =3D map(str, self._dbapi.aux_get(self._cpv, keys)) if len(keys) =3D=3D 1: return next(iter(val)) else: @@ -236,8 +235,8 @@ class PortageCPV(PortageDBCPV, PMInstallablePackage): return self._dbapi.getRepositoryName(self._tree) =20 def _aux_get(self, *keys): - val =3D itertools.imap(str, self._dbapi.aux_get(self._cpv, - keys, mytree =3D self._tree)) + val =3D map(str, self._dbapi.aux_get(self._cpv, keys, + mytree =3D self._tree)) if len(keys) =3D=3D 1: return next(iter(val)) else: