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 1QkYVI-0001oy-Sf for garchives@archives.gentoo.org; Sat, 23 Jul 2011 09:28:13 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A3EC421C051; Sat, 23 Jul 2011 09:27:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7196521C051 for ; Sat, 23 Jul 2011 09:27:45 +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 CA5001B4006 for ; Sat, 23 Jul 2011 09:27:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1AFE88003F for ; Sat, 23 Jul 2011 09:27:44 +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: Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/paludispm/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/paludispm/pkgset.py gentoopm/paludispm/repo.py X-VCS-Directories: gentoopm/paludispm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: ce7ceb28bdda7829199b2f412c78bbcff4eacb47 Date: Sat, 23 Jul 2011 09:27:44 +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: 368d26af52ceae37bc54aba6cdf8391a commit: ce7ceb28bdda7829199b2f412c78bbcff4eacb47 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Sat Jul 23 08:38:15 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Sat Jul 23 08:38:15 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3Dce7ceb28 Paludis: remove 'issorted'. --- gentoopm/paludispm/pkgset.py | 25 ++----------------------- gentoopm/paludispm/repo.py | 3 --- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/gentoopm/paludispm/pkgset.py b/gentoopm/paludispm/pkgset.py index f41fd16..86572ea 100644 --- a/gentoopm/paludispm/pkgset.py +++ b/gentoopm/paludispm/pkgset.py @@ -8,9 +8,8 @@ from gentoopm.exceptions import EmptyPackageSetError, Amb= iguousPackageSetError from gentoopm.paludispm.atom import PaludisAtom =20 class PaludisPackageSet(object): - def __init__(self, env, issorted =3D False): + def __init__(self, env): self._env =3D env - self._sorted =3D issorted =20 def filter(self, *args, **kwargs): newargs =3D [(a if not isinstance(a, str) @@ -18,27 +17,7 @@ class PaludisPackageSet(object): =20 return PaludisFilteredPackageSet(self, newargs, kwargs) =20 - @property - def best(self): - if self._sorted: - it =3D iter(self) - - try: - f =3D next(it) - except StopIteration: - raise EmptyPackageSetError('.best called on an empty set') - for p in it: - if p.key !=3D f.key: - raise AmbiguousPackageSetError('.best called on a set of differentl= y-named packages') - - try: - return p - except NameError: - return f - else: - return PMPackageSet.best.fget(self) - class PaludisFilteredPackageSet(PaludisPackageSet, PMFilteredPackageSet)= : def __init__(self, pset, args, kwargs): - PaludisPackageSet.__init__(self, pset._env, pset._sorted) + PaludisPackageSet.__init__(self, pset._env) PMFilteredPackageSet.__init__(self, pset, args, kwargs) diff --git a/gentoopm/paludispm/repo.py b/gentoopm/paludispm/repo.py index 1449923..3f82bcd 100644 --- a/gentoopm/paludispm/repo.py +++ b/gentoopm/paludispm/repo.py @@ -26,9 +26,6 @@ class PaludisEnumID(object): pass =20 class PaludisBaseRepo(PMRepository, PaludisPackageSet): - def __init__(self, env): - PaludisPackageSet.__init__(self, env, True) - @property def _gen(self): return paludis.Generator.All()