summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Script/SConscript.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/Script/SConscript.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/Script/SConscript.py')
-rw-r--r--src/engine/SCons/Script/SConscript.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index c55d220..4e43382 100644
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -46,12 +46,12 @@ import SCons.Script.Main
import SCons.Tool
import SCons.Util
+import collections
import os
import os.path
import re
import sys
import traceback
-import UserList
# The following variables used to live in this module. Some
# SConscript files out there may have referred to them directly as