[gentoo-commits] proj/gentoopm:master commit in: gentoopm/portagepm/, gentoopm/pkgcorepm/, gentoopm/paludispm/, gentoopm/basepm/

[Michał Górny]

commit:     4cec22e068a1537dc18ba1324b0869f5e9afe3e0
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  1 17:15:13 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug  1 17:15:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gentoopm.git;a=commit;h=4cec22e0

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
 
 	@abstractproperty
-	def slotted(self):
+	def slotted_atom(self):
 		"""
 		Return an atom matching all packages in the same slot as the associated
 		package.
@@ -338,8 +338,15 @@ class PMPackage(PMAtom, FillMissingComparisons):
 		"""
 		pass
 
+	@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
 
+	@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()
 
 	@property
-	def slotted(self):
+	def slotted_atom(self):
 		cp = str(self.key)
 		slot = self.slot
 		return PaludisAtom('%s:%s' % (cp, slot), self._env)
 
 	@property
-	def unversioned(self):
+	def unversioned_atom(self):
 		return PaludisAtom(str(self.key), self._env)
 
 	@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)
 
 	@property
-	def slotted(self):
+	def slotted_atom(self):
 		return PkgCoreAtom(self._pkg.slotted_atom)
 
 	@property
-	def unversioned(self):
+	def unversioned_atom(self):
 		return PkgCoreAtom(self._pkg.unversioned_atom)
 
 	@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)
 
 	@property
-	def slotted(self):
+	def slotted_atom(self):
 		cp = str(self.key)
 		slot = self.slot
 		return PortageAtom('%s:%s' % (cp, slot))
 
 	@property
-	def unversioned(self):
+	def unversioned_atom(self):
 		return PortageAtom(str(self.key))
 
 	@property