summaryrefslogtreecommitdiff
path: root/engine/SCons/PathList.py
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2010-06-15 09:21:32 +0000
committerLuca Falavigna <dktrkranz@debian.org>2010-06-15 09:21:32 +0000
commit07fc59e19636a4fc97a18b2038f3fe1c72a94000 (patch)
tree79d4a6239d81b2ccb4752d4f5ca25e0a7d3b4d4b /engine/SCons/PathList.py
parent7f642861f3946d4241cbd668de258293ba92767a (diff)
parent340d57481935334465037d97c0db1555b70c0eb1 (diff)
Merge commit 'upstream/2.0.0'
Diffstat (limited to 'engine/SCons/PathList.py')
-rw-r--r--engine/SCons/PathList.py11
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.