diff options
| author | Steven Knight <knight@baldmt.com> | 2010-04-07 15:29:39 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2010-04-07 15:29:39 (GMT) |
| commit | ca29ee5e30d4d4ad60d51f95e4ac61eee7e5cd42 (patch) | |
| tree | eb60dd8251a7fd064aa255309df2056dbf49a258 /src/engine/SCons/Util.py | |
| parent | 32d7c315d62846ea8febadcbb2c60cf9e3382cbf (diff) | |
| download | SCons-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/Util.py')
| -rw-r--r-- | src/engine/SCons/Util.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py index 4ada273..e88a90b 100644 --- a/src/engine/SCons/Util.py +++ b/src/engine/SCons/Util.py @@ -36,9 +36,7 @@ import re import sys import types -from UserDict import UserDict -from UserList import UserList -from UserString import UserString +from collections import UserDict, UserList, UserString # Don't "from types import ..." these because we need to get at the # types module later to look for UnicodeType. |