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 1Qnw4a-0004bs-92 for garchives@archives.gentoo.org; Mon, 01 Aug 2011 17:14:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC48721C0B3; Mon, 1 Aug 2011 17:14:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A777621C0B3 for ; Mon, 1 Aug 2011 17:14:21 +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 008D61B4013 for ; Mon, 1 Aug 2011 17:14:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 25F123C004 for ; Mon, 1 Aug 2011 17:14:20 +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: <4cec22e068a1537dc18ba1324b0869f5e9afe3e0.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/pkgcorepm/pkg.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: 4cec22e068a1537dc18ba1324b0869f5e9afe3e0 Date: Mon, 1 Aug 2011 17:14:20 +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: e04d98ca9d49a036387e7d331e0b320d commit: 4cec22e068a1537dc18ba1324b0869f5e9afe3e0 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Mon Aug 1 17:15:13 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Mon Aug 1 17:15:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoopm.git;= a=3Dcommit;h=3D4cec22e0 Rename pkg.{slotted,unversioned} to *_atom. --- gentoopm/basepm/pkg.py | 18 ++++++++++++++++-- gentoopm/paludispm/pkg.py | 4 ++-- gentoopm/pkgcorepm/pkg.py | 4 ++-- gentoopm/portagepm/pkg.py | 4 ++-- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/gentoopm/basepm/pkg.py b/gentoopm/basepm/pkg.py index 1442a5b..570c834 100644 --- a/gentoopm/basepm/pkg.py +++ b/gentoopm/basepm/pkg.py @@ -326,7 +326,7 @@ class PMPackage(PMAtom, FillMissingComparisons): pass =20 @abstractproperty - def slotted(self): + def slotted_atom(self): """ Return an atom matching all packages in the same slot as the associate= d package. @@ -338,8 +338,15 @@ class PMPackage(PMAtom, FillMissingComparisons): """ pass =20 + @property + def slotted(self): + """ + @deprecated: alias for L{PMPackage.slotted_atom} + """ + return self.slotted_atom + @abstractproperty - def unversioned(self): + def unversioned_atom(self): """ Return an atom matching all packages with the same key as the associated package. @@ -351,6 +358,13 @@ class PMPackage(PMAtom, FillMissingComparisons): """ pass =20 + @property + def unversioned(self): + """ + @deprecated: alias for L{PMPackage.unversioned_atom} + """ + return self.unversioned_atom + @abstractmethod def __lt__(self, other): pass diff --git a/gentoopm/paludispm/pkg.py b/gentoopm/paludispm/pkg.py index 8e77b9d..47e2028 100644 --- a/gentoopm/paludispm/pkg.py +++ b/gentoopm/paludispm/pkg.py @@ -89,13 +89,13 @@ class PaludisID(PMPackage, PaludisAtom): return self._pkg.fs_location_key().parse_value() =20 @property - def slotted(self): + def slotted_atom(self): cp =3D str(self.key) slot =3D self.slot return PaludisAtom('%s:%s' % (cp, slot), self._env) =20 @property - def unversioned(self): + def unversioned_atom(self): return PaludisAtom(str(self.key), self._env) =20 @property diff --git a/gentoopm/pkgcorepm/pkg.py b/gentoopm/pkgcorepm/pkg.py index f9281c2..5adfa17 100644 --- a/gentoopm/pkgcorepm/pkg.py +++ b/gentoopm/pkgcorepm/pkg.py @@ -112,11 +112,11 @@ class PkgCorePackage(PMPackage, PkgCoreAtom): return PkgCoreUseSet(self._pkg.iuse, self._pkg.use) =20 @property - def slotted(self): + def slotted_atom(self): return PkgCoreAtom(self._pkg.slotted_atom) =20 @property - def unversioned(self): + def unversioned_atom(self): return PkgCoreAtom(self._pkg.unversioned_atom) =20 @property diff --git a/gentoopm/portagepm/pkg.py b/gentoopm/portagepm/pkg.py index 9ba5a35..25ffd26 100644 --- a/gentoopm/portagepm/pkg.py +++ b/gentoopm/portagepm/pkg.py @@ -152,13 +152,13 @@ class PortageDBCPV(PMPackage, CompletePortageAtom): self._applied_use) =20 @property - def slotted(self): + def slotted_atom(self): cp =3D str(self.key) slot =3D self.slot return PortageAtom('%s:%s' % (cp, slot)) =20 @property - def unversioned(self): + def unversioned_atom(self): return PortageAtom(str(self.key)) =20 @property