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 1QjovT-0001CA-TF for garchives@archives.gentoo.org; Thu, 21 Jul 2011 08:48:12 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 99AC821C1E4; Thu, 21 Jul 2011 08:47:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5849F21C1E4 for ; Thu, 21 Jul 2011 08:47:23 +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 033721B4038 for ; Thu, 21 Jul 2011 08:47:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 622708003E for ; Thu, 21 Jul 2011 08:47:22 +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: <72df8c45b927d6dee7cb30646c765d840140955b.mgorny@gentoo> Subject: [gentoo-commits] proj/gentoopm:master commit in: gentoopm/portagepm/, gentoopm/pkgcorepm/, gentoopm/paludispm/, gentoopm/basepm/ X-VCS-Repository: proj/gentoopm X-VCS-Files: gentoopm/basepm/pkg.py gentoopm/paludispm/pkg.py gentoopm/paludispm/repo.py gentoopm/pkgcorepm/pkg.py gentoopm/pkgcorepm/repo.py gentoopm/portagepm/pkg.py X-VCS-Directories: gentoopm/portagepm/ gentoopm/pkgcorepm/ gentoopm/paludispm/ gentoopm/basepm/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 72df8c45b927d6dee7cb30646c765d840140955b Date: Thu, 21 Jul 2011 08:47:22 +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: de78e5a153f4f63198583823812ad59f commit: 72df8c45b927d6dee7cb30646c765d840140955b Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Thu Jul 21 08:34:15 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Thu Jul 21 08:34:15 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3D72df8c45 Introduce PMInstallablePackage, to clearly distinguish. This way, one kind of packages won't subclass another one, and we're clear to use isinstance(). --- gentoopm/basepm/pkg.py | 6 ++++++ gentoopm/paludispm/pkg.py | 5 ++++- gentoopm/paludispm/repo.py | 6 +++--- gentoopm/pkgcorepm/pkg.py | 21 +++++++++++---------- gentoopm/pkgcorepm/repo.py | 6 +++--- gentoopm/portagepm/pkg.py | 4 ++-- 6 files changed, 29 insertions(+), 19 deletions(-) diff --git a/gentoopm/basepm/pkg.py b/gentoopm/basepm/pkg.py index b5ec780..d5da061 100644 --- a/gentoopm/basepm/pkg.py +++ b/gentoopm/basepm/pkg.py @@ -229,6 +229,12 @@ class PMPackage(PMAtom, FillMissingComparisons): def associated(self): return True =20 +class PMInstallablePackage(PMPackage): + """ + An abstract class for a package which can be installed. + """ + pass + class PMInstalledPackage(PMPackage): """ An abstract class for a installed package. diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py index 437ddaf..74f2652 100644 --- a/gentoopm/paludispm/pkg.py +++ b/gentoopm/paludispm/pkg.py @@ -7,7 +7,7 @@ import paludis =20 from gentoopm.basepm.metadata import PMPackageMetadata from gentoopm.basepm.pkg import PMPackage, PMPackageDescription, \ - PMInstalledPackage + PMInstallablePackage, PMInstalledPackage from gentoopm.paludispm.atom import PaludisAtom, \ PaludisPackageKey, PaludisPackageVersion from gentoopm.util import SpaceSepTuple @@ -98,6 +98,9 @@ class PaludisID(PMPackage, PaludisAtom): raise TypeError('Unable to compare results of two enumerations') return self._num < other._num =20 +class PaludisInstallableID(PaludisID, PMInstallablePackage): + pass + class PaludisInstalledID(PaludisID, PMInstalledPackage): pass =20 diff --git a/gentoopm/paludispm/repo.py b/gentoopm/paludispm/repo.py index dc46ffe..27419a9 100644 --- a/gentoopm/paludispm/repo.py +++ b/gentoopm/paludispm/repo.py @@ -10,7 +10,7 @@ import paludis from gentoopm.basepm.repo import PMRepository, PMRepositoryDict, \ PMEbuildRepository from gentoopm.paludispm.atom import PaludisAtom -from gentoopm.paludispm.pkg import PaludisID, PaludisInstalledID +from gentoopm.paludispm.pkg import PaludisInstallableID, PaludisInstalle= dID from gentoopm.paludispm.pkgset import PaludisPackageSet =20 class PaludisRepoDict(PMRepositoryDict): @@ -87,14 +87,14 @@ class PaludisAtomFilteredRepo(PaludisBaseRepo): self._mypkg_class =3D repo._pkg_class =20 class PaludisStackRepo(PaludisBaseRepo): - _pkg_class =3D PaludisID + _pkg_class =3D PaludisInstallableID =20 @property def _filt(self): return paludis.Filter.SupportsInstallAction() =20 class PaludisLivefsRepository(PaludisBaseRepo, PMEbuildRepository): - _pkg_class =3D PaludisID + _pkg_class =3D PaludisInstallableID =20 def __init__(self, repo_obj, env): PaludisBaseRepo.__init__(self, env) diff --git a/gentoopm/pkgcorepm/pkg.py b/gentoopm/pkgcorepm/pkg.py index c255914..ec97c07 100644 --- a/gentoopm/pkgcorepm/pkg.py +++ b/gentoopm/pkgcorepm/pkg.py @@ -5,7 +5,7 @@ =20 from gentoopm.basepm.metadata import PMPackageMetadata from gentoopm.basepm.pkg import PMPackage, PMPackageDescription, \ - PMInstalledPackage + PMInstalledPackage, PMInstallablePackage from gentoopm.basepm.pkgset import PMPackageSet, PMFilteredPackageSet from gentoopm.pkgcorepm.atom import PkgCoreAtom from gentoopm.util import SpaceSepTuple @@ -53,15 +53,6 @@ class PkgCorePackage(PMPackage, PkgCoreAtom): return PkgCorePackageDescription(self._pkg) =20 @property - def inherits(self): - try: - l =3D self._pkg.data['_eclasses_'] - except KeyError: - l =3D () - - return SpaceSepTuple(l) - - @property def homepages(self): return SpaceSepTuple(self._pkg.homepage) =20 @@ -88,6 +79,16 @@ class PkgCorePackage(PMPackage, PkgCoreAtom): s =3D self._pkg.cpvstr return '=3D%s' % s =20 +class PkgCoreInstallablePackage(PkgCorePackage, PMInstallablePackage): + @property + def inherits(self): + try: + l =3D self._pkg.data['_eclasses_'] + except KeyError: + l =3D () + + return SpaceSepTuple(l) + def __lt__(self, other): if not isinstance(other, PkgCorePackage): raise TypeError('Unable to compare %s against %s' % \ diff --git a/gentoopm/pkgcorepm/repo.py b/gentoopm/pkgcorepm/repo.py index 1fc2d35..095d89e 100644 --- a/gentoopm/pkgcorepm/repo.py +++ b/gentoopm/pkgcorepm/repo.py @@ -9,8 +9,8 @@ import pkgcore.restrictions.boolean as br =20 from gentoopm.basepm.repo import PMRepository, PMRepositoryDict, \ PMEbuildRepository -from gentoopm.pkgcorepm.pkg import PkgCorePackage, PkgCorePackageSet, \ - PkgCoreFilteredPackageSet, PkgCoreInstalledPackage +from gentoopm.pkgcorepm.pkg import PkgCorePackageSet, PkgCoreFilteredPac= kageSet, \ + PkgCoreInstallablePackage, PkgCoreInstalledPackage from gentoopm.pkgcorepm.filter import transform_filters from gentoopm.util import FillMissingComparisons =20 @@ -77,7 +77,7 @@ class PkgCoreFilteredRepo(PkgCoreRepository): class PkgCoreEbuildRepo(PkgCoreRepository, PMEbuildRepository, FillMissingComparisons): =20 - _pkg_class =3D PkgCorePackage + _pkg_class =3D PkgCoreInstallablePackage =20 def __init__(self, repo_obj, index): PkgCoreRepository.__init__(self, repo_obj) diff --git a/gentoopm/portagepm/pkg.py b/gentoopm/portagepm/pkg.py index e82b232..8c0cd53 100644 --- a/gentoopm/portagepm/pkg.py +++ b/gentoopm/portagepm/pkg.py @@ -7,7 +7,7 @@ from portage.versions import cpv_getkey, cpv_getversion, = vercmp =20 from gentoopm.basepm.metadata import PMPackageMetadata from gentoopm.basepm.pkg import PMPackage, PMPackageDescription, \ - PMInstalledPackage + PMInstalledPackage, PMInstallablePackage from gentoopm.basepm.pkgset import PMPackageSet, PMFilteredPackageSet from gentoopm.portagepm.atom import PortageAtom, CompletePortageAtom, \ PortagePackageKey, PortagePackageVersion, _get_atom @@ -115,7 +115,7 @@ class PortageDBCPV(PMPackage, CompletePortageAtom): return cpv_getkey(self._cpv) < cpv_getkey(other._cpv) \ or vercmp(cpv_getversion(self._cpv), cpv_getversion(other._cpv)) < 0 =20 -class PortageCPV(PortageDBCPV): +class PortageCPV(PortageDBCPV, PMInstallablePackage): def __init__(self, cpv, dbapi, tree, repo_prio): PortageDBCPV.__init__(self, cpv, dbapi) self._tree =3D tree