Fix 2 more types.InstanceType comparisons that are broken by

the transition of dbapi to new-style classes. (trunk r6188)

svn path=/main/branches/2.1.2/; revision=10049

diff --git a/pym/portage.py b/pym/portage.py
index 61f82698e0240415896d388f2cf977c8cbfe2c16..d90b4027dcd7299a457bb39e5acc04ab83eb8e18 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -5818,7 +5818,7 @@ def key_expand(mykey, mydb=None, use_cache=1, settings=None):
        virts = settings.getvirtuals("/")
        virts_p = settings.get_virts_p("/")
        if len(mysplit)==1:
-               if mydb and type(mydb)==types.InstanceType:
+               if hasattr(mydb, "cp_list"):
                        for x in mydb.categories:
                                if mydb.cp_list(x+"/"+mykey,use_cache=use_cache):
                                        return x+"/"+mykey
@@ -5826,7 +5826,7 @@ def key_expand(mykey, mydb=None, use_cache=1, settings=None):
                                return(virts_p[mykey][0])
                return "null/"+mykey
        elif mydb:
-               if type(mydb)==types.InstanceType:
+               if hasattr(mydb, "cp_list"):
                        if (not mydb.cp_list(mykey,use_cache=use_cache)) and virts and virts.has_key(mykey):
                                return virts[mykey][0]
                return mykey