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 1QrzAa-0006aP-P8 for garchives@archives.gentoo.org; Fri, 12 Aug 2011 21:21:33 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 036A221C120; Fri, 12 Aug 2011 21:21:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B1D8A21C120 for ; Fri, 12 Aug 2011 21:21:24 +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 2042F1B4002 for ; Fri, 12 Aug 2011 21:21:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 568AD80040 for ; Fri, 12 Aug 2011 21:21:23 +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:0.2.x commit in: / X-VCS-Repository: proj/gentoopm X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: b9fb58a462d27fdf4e66d6d5b88c8ad9697df1b1 Date: Fri, 12 Aug 2011 21:21:23 +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: 50027109f5bbb15fb373dd2e631c770c Message-ID: <20110812212123.jLVGxbgtRH4aMqvyernsiWoex4TAVp-IqmIx0FXbe3c@z> commit: b9fb58a462d27fdf4e66d6d5b88c8ad9697df1b1 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Fri Aug 12 21:22:13 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Fri Aug 12 21:22:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3Db9fb58a4 Merge branch 'master' into 0.2.x Conflicts: gentoopm/basepm/metadata.py gentoopm/basepm/pkg.py gentoopm/paludispm/pkg.py gentoopm/pkgcorepm/pkg.py gentoopm/portagepm/pkg.py gentoopm/__init__.py | 6 ++-- gentoopm/basepm/__init__.py | 14 +++++++- gentoopm/basepm/atom.py | 2 +- gentoopm/basepm/config.py | 2 +- gentoopm/basepm/contents.py | 2 +- gentoopm/basepm/depend.py | 2 +- gentoopm/basepm/environ.py | 2 +- gentoopm/basepm/filter.py | 65 ++++++++++++++++++++++++++++++++++= +++++- gentoopm/basepm/pkg.py | 13 +++----- gentoopm/basepm/pkgset.py | 20 ++++++++---- gentoopm/basepm/repo.py | 5 ++- gentoopm/basepm/stack.py | 4 +- gentoopm/bash/__init__.py | 2 +- gentoopm/bash/bashserver.py | 5 ++- gentoopm/filters.py | 20 ++++++++++++ gentoopm/matchers.py | 44 +++++++++++++++++++++++++++ gentoopm/paludispm/__init__.py | 14 +++++--- gentoopm/paludispm/atom.py | 4 +- gentoopm/paludispm/config.py | 2 +- gentoopm/paludispm/contents.py | 3 +- gentoopm/paludispm/depend.py | 5 ++- gentoopm/paludispm/pkg.py | 14 ++++---- gentoopm/paludispm/pkgset.py | 7 ++-- gentoopm/paludispm/repo.py | 10 +++--- gentoopm/pkgcorepm/__init__.py | 15 ++++++--- gentoopm/pkgcorepm/atom.py | 4 +- gentoopm/pkgcorepm/config.py | 2 +- gentoopm/pkgcorepm/contents.py | 2 +- gentoopm/pkgcorepm/depend.py | 5 ++- gentoopm/pkgcorepm/filter.py | 4 +- gentoopm/pkgcorepm/pkg.py | 13 ++++---- gentoopm/pkgcorepm/repo.py | 9 +++-- gentoopm/portagepm/__init__.py | 15 ++++++--- gentoopm/portagepm/atom.py | 4 +- gentoopm/portagepm/config.py | 2 +- gentoopm/portagepm/contents.py | 3 +- gentoopm/portagepm/depend.py | 2 +- gentoopm/portagepm/pkg.py | 15 +++++---- gentoopm/portagepm/repo.py | 19 ++++++++---- gentoopm/querycli.py | 30 +++++++++++++++++- gentoopm/submodules.py | 8 ++-- gentoopm/tests/atom.py | 5 ++- gentoopm/tests/config.py | 2 +- gentoopm/tests/pkg.py | 2 +- gentoopm/tests/psets.py | 7 ++-- gentoopm/tests/repo.py | 2 +- 46 files changed, 316 insertions(+), 121 deletions(-) diff --cc gentoopm/basepm/pkg.py index da0a346,4a17335..a0bf73b --- a/gentoopm/basepm/pkg.py +++ b/gentoopm/basepm/pkg.py @@@ -137,11 -136,29 +137,8 @@@ class PMPackage(PMAtom, FillMissingComp else: raise ValueError('Incorrect positional argument: %s' % f) =20 - for k, m in kwargs.items(): - raise KeyError('Unmatched keyword argument: %s' % k) -=20 return True =20 - @property - def id(self): - """ - An unique identifier for the package. - - @type: hashable - @deprecated: use the package itself or its C{hash()} instead - """ - return self - - @property - def atom(self): - """ - Return an atom matching the package uniquely. - - @type: L{PMAtom} - @deprecated: the package is now a subclass of L{PMAtom} - and can be used directly as an atom - """ - return self - @abstractproperty def path(self): """ diff --cc gentoopm/paludispm/pkg.py index 8f9ba80,a3a988c..784be26 --- a/gentoopm/paludispm/pkg.py +++ b/gentoopm/paludispm/pkg.py @@@ -5,15 -5,16 +5,15 @@@ =20 import paludis =20 - from gentoopm.basepm.depend import PMRequiredUseAtom - from gentoopm.basepm.pkg import PMPackage, PMPackageDescription, \ + from ..basepm.depend import PMRequiredUseAtom -from ..basepm.metadata import PMPackageMetadata + from ..basepm.pkg import PMPackage, PMPackageDescription, \ PMInstallablePackage, PMInstalledPackage, PMBoundPackageKey, \ PMPackageState, PMUseFlag - from gentoopm.paludispm.atom import PaludisAtom, \ - PaludisPackageKey, PaludisPackageVersion - from gentoopm.paludispm.contents import PaludisPackageContents - from gentoopm.paludispm.depend import PaludisPackageDepSet - from gentoopm.util import SpaceSepFrozenSet, SpaceSepTuple + from ..util import SpaceSepFrozenSet, SpaceSepTuple +=20 + from .atom import PaludisAtom, PaludisPackageKey, PaludisPackageVersion + from .contents import PaludisPackageContents + from .depend import PaludisPackageDepSet =20 class PaludisBoundPackageKey(PaludisPackageKey, PMBoundPackageKey): def __init__(self, key, pkg): diff --cc gentoopm/pkgcorepm/pkg.py index 00a2c1f,adc0c6d..8a1fcbf --- a/gentoopm/pkgcorepm/pkg.py +++ b/gentoopm/pkgcorepm/pkg.py @@@ -3,14 -3,16 +3,15 @@@ # (c) 2011 Micha=C5=82 G=C3=B3rny # Released under the terms of the 2-clause BSD license. =20 - from gentoopm.basepm.pkg import PMPackage, PMPackageDescription, \ -from ..basepm.metadata import PMPackageMetadata + from ..basepm.pkg import PMPackage, PMPackageDescription, \ PMInstalledPackage, PMInstallablePackage, PMBoundPackageKey, \ PMPackageState, PMUseFlag - from gentoopm.basepm.pkgset import PMPackageSet, PMFilteredPackageSet - from gentoopm.pkgcorepm.atom import PkgCoreAtom, PkgCorePackageKey - from gentoopm.pkgcorepm.contents import PkgCorePackageContents - from gentoopm.pkgcorepm.depend import PkgCorePackageDepSet - from gentoopm.util import SpaceSepTuple, SpaceSepFrozenSet + from ..basepm.pkgset import PMPackageSet, PMFilteredPackageSet + from ..util import SpaceSepTuple, SpaceSepFrozenSet +=20 + from .atom import PkgCoreAtom, PkgCorePackageKey + from .contents import PkgCorePackageContents + from .depend import PkgCorePackageDepSet =20 class PkgCorePackageSet(PMPackageSet): def filter(self, *args, **kwargs): diff --cc gentoopm/portagepm/pkg.py index a0a6746,5992ae2..8f73ea0 --- a/gentoopm/portagepm/pkg.py +++ b/gentoopm/portagepm/pkg.py @@@ -5,16 -5,18 +5,17 @@@ =20 from portage.versions import cpv_getkey, cpv_getversion, vercmp =20 - from gentoopm.basepm.depend import PMRequiredUseAtom - from gentoopm.basepm.pkg import PMPackage, PMPackageDescription, \ + from ..basepm.depend import PMRequiredUseAtom -from ..basepm.metadata import PMPackageMetadata + from ..basepm.pkg import PMPackage, PMPackageDescription, \ PMInstalledPackage, PMInstallablePackage, PMBoundPackageKey, \ PMPackageState, PMUseFlag - from gentoopm.basepm.pkgset import PMPackageSet, PMFilteredPackageSet - from gentoopm.portagepm.atom import PortageAtom, CompletePortageAtom, \ + from ..basepm.pkgset import PMPackageSet, PMFilteredPackageSet + from ..util import SpaceSepTuple, SpaceSepFrozenSet +=20 + from .atom import PortageAtom, CompletePortageAtom, \ PortagePackageKey, PortagePackageVersion, _get_atom - from gentoopm.portagepm.contents import PortagePackageContents - from gentoopm.portagepm.depend import PortagePackageDepSet - from gentoopm.util import SpaceSepTuple, SpaceSepFrozenSet + from .contents import PortagePackageContents + from .depend import PortagePackageDepSet =20 class PortagePackageSet(PMPackageSet): def filter(self, *args, **kwargs):