uses "str" types - as normal ;) ... dbus.String sucks

2 files changed, 29 insertions, 29 deletions

diff --git a/portato/backend/catapult/package.py b/portato/backend/catapult/package.py
index 1ed818e..32ea379 100644
--- a/portato/backend/catapult/package.py
+++ b/portato/backend/catapult/package.py
@@ -36,16 +36,16 @@ class CatapultPackage(Package):
 	def use_expanded (self, flag, suggest = None):
 		if not suggest:
 			suggest = ""
-		return self.proxy.use_expanded(self.get_cpv(), flag, suggest)
+		return str(self.proxy.use_expanded(self.get_cpv(), flag, suggest))
 
 	def get_cp (self):
-		return self.proxy.get_cp(self.get_cpv())
+		return str(self.proxy.get_cp(self.get_cpv()))
 
 	def get_slot_cp (self):
-		return self.proxy.get_slot_cp(self.get_cpv())
+		return str(self.proxy.get_slot_cp(self.get_cpv()))
 
 	def get_package_path(self):
-		return self.proxy.get_package_path(self.get_cpv())
+		return str(self.proxy.get_package_path(self.get_cpv()))
 
 	def is_installed(self):
 		return self.proxy.is_installed(self.get_cpv())
@@ -54,7 +54,7 @@ class CatapultPackage(Package):
 		return self.proxy.is_in_overlay(self.get_cpv())
 
 	def get_overlay_path(self):
-		return self.proxy.get_overlay_path(self.get_cpv())
+		return str(self.proxy.get_overlay_path(self.get_cpv()))
 		
 	def is_in_system (self):
 		return self.proxy.is_in_system(self.get_cpv())
@@ -102,25 +102,25 @@ class CatapultPackage(Package):
 			return False
 
 	def get_masking_reason (self):
-		return self.proxy.get_masking_reason(self.get_cpv())
+		return str(self.proxy.get_masking_reason(self.get_cpv()))
 		
 	def get_iuse_flags (self, installed = False):
-		return self.proxy.get_iuse_flags(self.get_cpv(), installed)
+		return [str(x) for x in self.proxy.get_iuse_flags(self.get_cpv(), installed)]
 
 	def get_matched_dep_packages (self, depvar):
-		return self.proxy.get_matched_dep_packages(self.get_cpv(), self.get_new_use_flags())
+		return [str(x) for x in self.proxy.get_matched_dep_packages(self.get_cpv(), self.get_new_use_flags())]
 		
 	def get_dep_packages (self, depvar = ["RDEPEND", "PDEPEND", "DEPEND"], with_criterions = False):
-		return self.proxy.get_dep_packages(self.get_cpv(), depvar, self.get_new_use_flags(), with_criterions)
+		return [str(x) for x in self.proxy.get_dep_packages(self.get_cpv(), depvar, self.get_new_use_flags(), with_criterions)]
 
 	def get_global_settings(self, key):
-		return self.proxy.get_global_settings(self.get_cpv(), key)
+		return str(self.proxy.get_global_settings(self.get_cpv(), key))
 
 	def get_ebuild_path(self):
-		return self.proxy.get_ebuild_path(self.get_cpv())
+		return str(self.proxy.get_ebuild_path(self.get_cpv()))
 
 	def get_package_settings(self, var, tree = True):
-		return self.proxy.get_package_settings(self.get_cpv(), var, tree)
+		return str(self.proxy.get_package_settings(self.get_cpv(), var, tree))
 
 	def get_use_flags(self):
 		return " ".join(self.proxy.get_use_flags(self.get_cpv()))
diff --git a/portato/backend/catapult/system.py b/portato/backend/catapult/system.py
index e72bdda..4d9173e 100644
--- a/portato/backend/catapult/system.py
+++ b/portato/backend/catapult/system.py
@@ -44,18 +44,18 @@ class CatapultSystem (SystemInterface):
 		if not only_cpv:
 			return [CatapultPackage(x) for x in list_of_packages]
 		else:
-			return list_of_packages
+			return [str(x) for x in list_of_packages]
 
 
 	def split_cpv (self, cpv):
-		return self.proxy.split_cpv(cpv)
+		return [str(x) for x in self.proxy.split_cpv(cpv)]
 
 	def cpv_matches (self, cpv, criterion):
 		return CatapultPackage(cpv).matches(criterion)
 
 	def find_best(self, list, only_cpv = False):
 		if only_cpv:
-			return self.proxy.find_best(list)
+			return str(self.proxy.find_best(list))
 		else:
 			return CatapultPackage(self.proxy.find_best(list))
 
@@ -64,7 +64,7 @@ class CatapultSystem (SystemInterface):
 
 		if p and not only_cpv:
 			return CatapultPackage(p)
-		return p
+		return str(p)
 
 	def find_packages (self, search_key, masked = False, only_cpv = False):
 		return self.geneticize_list(self.proxy.find_packages(search_key, masked), only_cpv)
@@ -115,7 +115,7 @@ class CatapultSystem (SystemInterface):
 	def list_categories (self, name = None):
 		if not name:
 			name = ""
-		return self.proxy.list_categories(name)
+		return [str(x) for x in self.proxy.list_categories(name)]
 
 	def sort_package_list(self, pkglist):
 		return self.geneticize_list(self.proxy.sort_package_list([x.get_cpv() for x in pkglist]))
@@ -132,43 +132,43 @@ class CatapultSystem (SystemInterface):
 	def get_use_desc (self, flag, package = None):
 		if not package:
 			package = ""
-		return self.proxy.get_use_desc(flag, package)
+		return str(self.proxy.get_use_desc(flag, package))
 
 	def get_global_settings(self, key):
-		return self.proxy.get_global_settings(key)
+		return str(self.proxy.get_global_settings(key))
 
 	def new_package (self, cpv):
 		return CatapultPackage(cpv)
 
 	def get_config_path (self):
-		return self.proxy.get_config_path()
+		return str(self.proxy.get_config_path())
 
 	def get_world_file_path (self):
-		return self.proxy.get_world_file_path()
+		return str(self.proxy.get_world_file_path())
 	
 	def get_sync_command (self):
-		return self.proxy.get_sync_command()
+		return [str(x) for x in self.proxy.get_sync_command()]
 
 	def get_merge_command (self):
-		return self.proxy.get_merge_command()
+		return [str(x) for x in self.proxy.get_merge_command()]
 
 	def get_oneshot_option (self):
-		return self.proxy.get_oneshot_option()
+		return [str(x) for x in self.proxy.get_oneshot_option()]
 
 	def get_newuse_option (self):
-		return self.proxy.get_newuse_option()
+		return [str(x) for x in self.proxy.get_newuse_option()]
 
 	def get_deep_option (self):
-		return self.proxy.get_deep_option()
+		return [str(x) for x in self.proxy.get_deep_option()]
 
 	def get_update_option (self):
-		return self.proxy.get_update_option()
+		return [str(x) for x in self.proxy.get_update_option()]
 
 	def get_pretend_option (self):
-		return self.proxy.get_pretend_option()
+		return [str(x) for x in self.proxy.get_pretend_option()]
 
 	def get_unmerge_option (self):
-		return self.proxy.get_unmerge_option()
+		return [str(x) for x in self.proxy.get_unmerge_option()]
 
 	def get_environment (self):
 		return self.proxy.get_environment()