Fix the stuff merged in from atom

3 files changed, 5 insertions, 3 deletions

diff --git a/portato/backend/package.py b/portato/backend/package.py
index 56b910d..f86ee13 100644
--- a/portato/backend/package.py
+++ b/portato/backend/package.py
@@ -155,7 +155,7 @@ class Package (_Package):
         @returns: category/package.
         @rtype: string"""
         
-        return "/".join(self.get_category(), self.get_name())
+        return "/".join((self.get_category(), self.get_name()))
 
     def get_slot (self):
         """Returns the slot.
@@ -174,7 +174,7 @@ class Package (_Package):
         @returns: cp:slot
         @rtype: string"""
 
-        return ":".join(self.get_cp(), self.get_slot())
+        return ":".join((self.get_cp(), self.get_slot()))
 
     def get_package_path(self):
         """Returns the path to where the ChangeLog, Manifest, .ebuild files reside.
diff --git a/portato/backend/portage/package.py b/portato/backend/portage/package.py
index 7dbefb7..59ebe1e 100644
--- a/portato/backend/portage/package.py
+++ b/portato/backend/portage/package.py
@@ -299,5 +299,5 @@ class PortagePackage (Package):
 
     def matches (self, criterion):
         # cpv_matches needs explicit slot info
-        scpv = ":".join(self.get_cpv(), self.get_slot())
+        scpv = ":".join((self.get_cpv(), self.get_slot()))
         return system.cpv_matches(scpv, criterion)
diff --git a/portato/backend/portage/system.py b/portato/backend/portage/system.py
index 34d2b5c..b882237 100644
--- a/portato/backend/portage/system.py
+++ b/portato/backend/portage/system.py
@@ -213,6 +213,8 @@ class PortageSystem (SystemInterface):
 
         if (not only_cpv) and with_version:
             result = map(self.new_package, result)
+        else:
+            result = list(result)
         
         return result