summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Variables/ListVariable.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2010-04-07 15:29:39 (GMT)
committerSteven Knight <knight@baldmt.com>2010-04-07 15:29:39 (GMT)
commitca29ee5e30d4d4ad60d51f95e4ac61eee7e5cd42 (patch)
treeeb60dd8251a7fd064aa255309df2056dbf49a258 /src/engine/SCons/Variables/ListVariable.py
parent32d7c315d62846ea8febadcbb2c60cf9e3382cbf (diff)
downloadSCons-ca29ee5e30d4d4ad60d51f95e4ac61eee7e5cd42.zip
SCons-ca29ee5e30d4d4ad60d51f95e4ac61eee7e5cd42.tar.gz
SCons-ca29ee5e30d4d4ad60d51f95e4ac61eee7e5cd42.tar.bz2
Issue 2334: Use compatibility versions of collections.User{Dict,List,String}
instead of the deprecated User{Dict,List,String} modules. The two test scripts that use User{List,String} fall back on ImportError by hand.
Diffstat (limited to 'src/engine/SCons/Variables/ListVariable.py')
-rw-r--r--src/engine/SCons/Variables/ListVariable.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/SCons/Variables/ListVariable.py b/src/engine/SCons/Variables/ListVariable.py
index 5980f33..6cab091 100644
--- a/src/engine/SCons/Variables/ListVariable.py
+++ b/src/engine/SCons/Variables/ListVariable.py
@@ -55,14 +55,14 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
__all__ = ['ListVariable',]
-import UserList
+import collections
import SCons.Util
-class _ListVariable(UserList.UserList):
+class _ListVariable(collections.UserList):
def __init__(self, initlist=[], allowedElems=[]):
- UserList.UserList.__init__(self, [_f for _f in initlist if _f])
+ collections.UserList.__init__(self, [_f for _f in initlist if _f])
self.allowedElems = sorted(allowedElems)
def __cmp__(self, other):