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.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index d7846c5..472f99f 100644
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -45,9 +45,9 @@ from __future__ import generators  ### KEEP FOR COMPATIBILITY FIXERS
 
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
+import collections
 import copy
 from itertools import chain, izip
-import UserList
 
 from SCons.Debug import logInstanceCreation
 import SCons.Executor
@@ -1255,7 +1255,7 @@ class Node:
             return ( ' '*11).join(lines)
 
 try:
-    [].extend(UserList.UserList([]))
+    [].extend(collections.UserList([]))
 except TypeError:
     # Python 1.5.2 doesn't allow a list to be extended by list-like
     # objects (such as UserList instances), so just punt and use
@@ -1263,7 +1263,7 @@ except TypeError:
     def NodeList(l):
         return l
 else:
-    class NodeList(UserList.UserList):
+    class NodeList(collections.UserList):
         def __str__(self):
             return str(list(map(str, self.data)))