Simplify None Package.slot handling in match_from_list().

svn path=/main/trunk/; revision=10499

diff --git a/pym/portage/dep.py b/pym/portage/dep.py
index efabee2627b3ca61c86656fd4792996320bfeb82..d0e487afc135646f33bc606d42043ae44e53be80 100644 (file)
--- a/pym/portage/dep.py
+++ b/pym/portage/dep.py
@@ -885,8 +885,8 @@ def match_from_list(mydep, candidate_list):
                candidate_list = mylist
                mylist = []
                for x in candidate_list:
-                       xslot = getattr(x, "slot", None)
-                       if xslot is None and isinstance(x, basestring):
+                       xslot = getattr(x, "slot", False)
+                       if xslot is False:
                                xslot = dep_getslot(x)
                        if xslot is not None and xslot != slot:
                                continue