[gentoo-commits] portage r13474 - main/branches/2.1.6/pym/_emerge

[Zac Medico (zmedico)]

Author: zmedico
Date: 2009-04-30 07:01:14 +0000 (Thu, 30 Apr 2009)
New Revision: 13474

Modified:
   main/branches/2.1.6/pym/_emerge/__init__.py
Log:
Add UseFlagDisplay.sort_combined and sort_separated attributes that can be
passed directly as key parameters to list.sort(). (trunk r13303)

Modified: main/branches/2.1.6/pym/_emerge/__init__.py
===================================================================
--- main/branches/2.1.6/pym/_emerge/__init__.py	2009-04-30 07:01:03 UTC (rev 13473)
+++ main/branches/2.1.6/pym/_emerge/__init__.py	2009-04-30 07:01:14 UTC (rev 13474)
@@ -9236,15 +9236,16 @@
 			s = '(%s)' % s
 		return s
 
-	@classmethod
-	def cmp_combined(cls, a, b):
+	def _cmp_combined(a, b):
 		"""
 		Sort by name, combining enabled and disabled flags.
 		"""
 		return (a.name > b.name) - (a.name < b.name)
 
-	@classmethod
-	def cmp_separated(cls, a, b):
+	sort_combined = cmp_sort_key(_cmp_combined)
+	del _cmp_combined
+
+	def _cmp_separated(a, b):
 		"""
 		Sort by name, separating enabled flags from disabled flags.
 		"""
@@ -9253,6 +9254,9 @@
 			return enabled_diff
 		return (a.name > b.name) - (a.name < b.name)
 
+	sort_separated = cmp_sort_key(_cmp_separated)
+	del _cmp_separated
+
 class PollSelectAdapter(PollConstants):
 
 	"""
@@ -13511,9 +13515,9 @@
 				for f in use_disabled.get(varname, []):
 					flags.append(UseFlagDisplay(f, False, f in forced_flags))
 				if alphabetical_use:
-					flags.sort(key=cmp_sort_key(UseFlagDisplay.cmp_combined))
+					flags.sort(key=UseFlagDisplay.sort_combined)
 				else:
-					flags.sort(key=cmp_sort_key(UseFlagDisplay.cmp_separated))
+					flags.sort(key=UseFlagDisplay.sort_separated)
 				print '%s="%s"' % (varname, ' '.join(str(f) for f in flags)),
 			print