Merge commit 'upstream/2.0.0'

1 files changed, 5 insertions, 6 deletions

diff --git a/engine/SCons/PathList.py b/engine/SCons/PathList.py
index 307edd8..764b0b8 100644
--- a/engine/SCons/PathList.py
+++ b/engine/SCons/PathList.py
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/PathList.py 4720 2010/03/24 03:14:11 jars"
+__revision__ = "src/engine/SCons/PathList.py 5023 2010/06/14 22:05:46 scons"
 
 __doc__ = """SCons.PathList
 
@@ -33,7 +33,6 @@ Do the Right Thing (almost) regardless of how the variable is specified.
 """
 
 import os
-import string
 
 import SCons.Memoize
 import SCons.Node
@@ -67,7 +66,7 @@ def node_conv(obj):
         result = get()
     return result
 
-class _PathList:
+class _PathList(object):
     """
     An actual PathList object.
     """
@@ -98,14 +97,14 @@ class _PathList:
         over and over for each target.
         """
         if SCons.Util.is_String(pathlist):
-            pathlist = string.split(pathlist, os.pathsep)
+            pathlist = pathlist.split(os.pathsep)
         elif not SCons.Util.is_Sequence(pathlist):
             pathlist = [pathlist]
 
         pl = []
         for p in pathlist:
             try:
-                index = string.find(p, '$')
+                index = p.find('$')
             except (AttributeError, TypeError):
                 type = TYPE_OBJECT
             else:
@@ -142,7 +141,7 @@ class _PathList:
         return tuple(result)
 
 
-class PathListCache:
+class PathListCache(object):
     """
     A class to handle caching of PathList lookups.