Merged from trunk 6497:6500

   +------------------------------------------------------------------------+
   | 6498      | validators++                                               |
   | WarnerBro |                                                            |
   |-----------+------------------------------------------------------------|
   | 6499      | Honestly if they are missing sys, that error message       |
   | WarnerBro | probably won't help any more than the other one (zomg      |
   |           | broken)                                                    |
   |-----------+------------------------------------------------------------|
   | 6500      | imports are one module per line, remove type module in     |
   | WarnerBro | favor of the new hotness, isinstance.                      |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=6501

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 0357375b316e20529eaefa25d80f2de21f6e8b85..7d92958722541984261c1612f203e2f866408794 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -12,12 +12,12 @@ VERSION="$Rev$"[6:-2] + "-svn"
 
 try:
        import sys
-except ImportError:
-       print "Failed to import sys! Something is _VERY_ wrong with python."
-       raise
-
-try:
-       import copy, errno, os, re, shutil, time, types
+  import copy
+  import errno
+  import os
+  import re
+  import shutil
+  import time
        try:
                import cPickle
        except ImportError:
@@ -296,7 +296,7 @@ def flatten(mytokens):
        a [1,2,3] list and returns it."""
        newlist=[]
        for x in mytokens:
-               if type(x)==types.ListType:
+               if isinstance(x, list):
                        newlist.extend(flatten(x))
                else:
                        newlist.append(x)
@@ -2161,7 +2161,7 @@ class config:
 
        def __setitem__(self,mykey,myvalue):
                "set a value; will be thrown away at reset() time"
-               if type(myvalue) != types.StringType:
+               if not isinstance(myvalue, str):
                        raise ValueError("Invalid type being used as a value: '%s': '%s'" % (str(mykey),str(myvalue)))
                self.modifying()
                self.modifiedkeys += [mykey]
@@ -2253,7 +2253,7 @@ def spawn(mystring, mysettings, debug=0, free=0, droppriv=0, sesandbox=0, **keyw
        1. The return code of the spawned process.
        """
 
-       if type(mysettings) == types.DictType:
+       if isinstance(mysettings, dict):
                env=mysettings
                keywords["opt_name"]="[ %s ]" % "portage"
        else:
@@ -4046,7 +4046,7 @@ def dep_virtual(mysplit, mysettings):
        newsplit=[]
        myvirtuals = mysettings.getvirtuals()
        for x in mysplit:
-               if type(x)==types.ListType:
+               if isinstance(x, list):
                        newsplit.append(dep_virtual(x, mysettings))
                else:
                        mykey=dep_getkey(x)
@@ -4174,7 +4174,7 @@ def dep_eval(deplist):
        if deplist[0]=="||":
                #or list; we just need one "1"
                for x in deplist[1:]:
-                       if type(x)==types.ListType:
+                       if isinstance(x, list):
                                if dep_eval(x)==1:
                                        return 1
                        elif x==1:
@@ -4187,7 +4187,7 @@ def dep_eval(deplist):
                return 0
        else:
                for x in deplist:
-                       if type(x)==types.ListType:
+                       if isinstance(x, list):
                                if dep_eval(x)==0:
                                        return 0
                        elif x==0 or x==2:
@@ -4453,7 +4453,7 @@ def dep_wordreduce(mydeplist,mysettings,mydbapi,mode,use_cache=1):
        "Reduces the deplist to ones and zeros"
        deplist=mydeplist[:]
        for mypos in xrange(len(deplist)):
-               if type(deplist[mypos])==types.ListType:
+               if isinstance(deplist[mypos], list):
                        #recurse
                        deplist[mypos]=dep_wordreduce(deplist[mypos],mysettings,mydbapi,mode,use_cache=use_cache)
                elif deplist[mypos]=="||":
@@ -4579,7 +4579,7 @@ def cpv_expand(mycpv, mydb=None, use_cache=1, settings=None):
                elif matches:
                        mykey=matches[0]
 
-               if not mykey and type(mydb)!=types.ListType:
+               if not mykey and not isinstance(mydb, list):
                        if virts_p.has_key(myp):
                                mykey=virts_p[myp][0]
                        #again, we only perform virtual expansion if we have a dbapi (not a list)

diff --git a/pym/portage/env/config.py b/pym/portage/env/config.py
index 62d3d8177b41b2a042fd46be70df60f25c05ef0c..192d1085293d6980103921fcc60eec90ca83a199 100644 (file)
--- a/pym/portage/env/config.py
+++ b/pym/portage/env/config.py
@@ -38,7 +38,8 @@ class PackageKeywordsFile(UserConfigKlass):
        default_loader = KeyListFileLoader
 
        def __init__(self, filename):
-               super(PackageKeywordsFile,self).__init__(self.default_loader(filename))
+               super(PackageKeywordsFile, self).__init__(
+                       self.default_loader(filename, validator=None))
        
 class PackageUseFile(UserConfigKlass):
        """
@@ -47,7 +48,8 @@ class PackageUseFile(UserConfigKlass):
 
        default_loader = KeyListFileLoader
        def __init__(self, filename):
-               super(PackageUseFile,self).__init__(self.default_loader(filename))
+               super(PackageUseFile, self).__init__(
+                       self.default_loader(filename, validator=None))
        
 class PackageMaskFile(UserConfigKlass):
        """
@@ -64,7 +66,8 @@ class PackageMaskFile(UserConfigKlass):
        default_loader = ItemFileLoader
 
        def __init__(self, filename):
-               super(PackageMaskFile,self).__init__(self.default_loader(filename))
+               super(PackageMaskFile, self).__init__(
+                       self.default_loader(filename, validator=None))
 
 class PortageModulesFile(UserConfigKlass):
        """
@@ -74,4 +77,5 @@ class PortageModulesFile(UserConfigKlass):
        default_loader = KeyValuePairFileLoader
        
        def __init__(self, filename):
-               super(PortageModulesFile,self).__init__(self.default_loader(filename))
+               super(PortageModulesFile, self).__init__(
+                        self.default_loader(filename, validator=None))

diff --git a/pym/portage/env/loaders.py b/pym/portage/env/loaders.py
index c9fb7473d542a9b7fa231fbc9a1f8d5105fb988e..f670345a527977142c8b99df80eb6645ffb71ef1 100644 (file)
--- a/pym/portage/env/loaders.py
+++ b/pym/portage/env/loaders.py
@@ -28,7 +28,7 @@ def RecursiveFileLoader(filename):
        full of files in that directory to process.
        
        Ignore files beginning with . or ending in ~.
-       Prune CVS directories.  
+       Prune CVS directories.
 
        @param filename: name of a file/directory to traverse
        @rtype: list
@@ -81,8 +81,8 @@ class ItemFileLoader(DataLoader):
        
        _recursive = False
 
-       def __init__(self, filename):
-               DataLoader.__init__(self)
+       def __init__(self, filename, validator):
+               DataLoader.__init__(self, validator)
                self.fname = filename
        
        def load(self):
@@ -118,8 +118,8 @@ class KeyListFileLoader(DataLoader):
 
        _recursive = False
 
-       def __init__(self, filename):
-               DataLoader.__init__(self)
+       def __init__(self, filename, validator):
+               DataLoader.__init__(self, validator)
                self.fname = filename
 
        def load(self):
@@ -162,8 +162,8 @@ class KeyValuePairFileLoader(DataLoader):
 
        _recursive = False
 
-       def __init__(self, filename):
-               DataLoader.__init__(self)
+       def __init__(self, filename, validator):
+               DataLoader.__init__(self, validator)
                self.fname = filename
 
        def load(self):