[gentoo-portage-dev] [PATCH 1/6] eshowkw: Split Prefix keyword test into separate function

[Michał Górny]

---
 pym/gentoolkit/eshowkw/keywords_header.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pym/gentoolkit/eshowkw/keywords_header.py b/pym/gentoolkit/eshowkw/keywords_header.py
index 9c6538c..f92a96d 100644
--- a/pym/gentoolkit/eshowkw/keywords_header.py
+++ b/pym/gentoolkit/eshowkw/keywords_header.py
@@ -97,6 +97,10 @@ class keywords_header:
 		return [x for x in ports.archlist()
 			if not x.startswith('~')]
 
+	@staticmethod
+	def __isPrefix(k):
+		return len(k.split('-')) != 1
+
 	def __sortKeywords(self, keywords, prefix = False, required_keywords = []):
 		"""Sort keywords: order by status (IMP, then DEV, then EXP, then
 		prefix), then by name."""
@@ -109,10 +113,9 @@ class keywords_header:
 			if len(tmpkeywords) != 0:
 				keywords = tmpkeywords
 
-		normal = [k for k in keywords if len(k.split('-')) == 1]
+		normal = [k for k in keywords if not self.__isPrefix(k)]
 		if prefix:
-			longer = [k for k in keywords
-				if len(k.split('-')) != 1]
+			longer = [k for k in keywords if self.__isPrefix(k)]
 			longer.sort()
 			normal.extend(longer)
 
-- 
2.16.1