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 /test/SConscript | |
| 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 'test/SConscript')
| -rw-r--r-- | test/SConscript/SConscript.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/SConscript/SConscript.py b/test/SConscript/SConscript.py index 5bd49f3..177b5df 100644 --- a/test/SConscript/SConscript.py +++ b/test/SConscript/SConscript.py @@ -71,10 +71,13 @@ assert foo == "subdir/SConscript foo" SConscript('SConscript5') -import UserList +try: + from io import UserList +except ImportError: + from UserList import UserList x7 = "SConstruct x7" x8 = "SConstruct x8" -x9 = SConscript('SConscript6', UserList.UserList(["x7", "x8"])) +x9 = SConscript('SConscript6', UserList(["x7", "x8"])) assert x9 == "SConscript6 x9", x9 SConscript('SConscript7') |