diff options
| author | Greg Noel <GregNoel@tigris.org> | 2010-04-25 07:10:15 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2010-04-25 07:10:15 (GMT) |
| commit | 186b632fd20283e821b6a65c72772635017945fb (patch) | |
| tree | 3863a0df57143ab053895e2719d7b1d96ce4821c /test | |
| parent | 1c13a030e39109c5343046d0d555f48b7cc61126 (diff) | |
| download | SCons-186b632fd20283e821b6a65c72772635017945fb.zip SCons-186b632fd20283e821b6a65c72772635017945fb.tar.gz SCons-186b632fd20283e821b6a65c72772635017945fb.tar.bz2 | |
Fix regression tests (imports not happening as expected)
Diffstat (limited to 'test')
| -rw-r--r-- | test/SConscript/SConscript.py | 4 | ||||
| -rw-r--r-- | test/subclassing.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/SConscript/SConscript.py b/test/SConscript/SConscript.py index 177b5df..c8453a7 100644 --- a/test/SConscript/SConscript.py +++ b/test/SConscript/SConscript.py @@ -72,9 +72,9 @@ assert foo == "subdir/SConscript foo" SConscript('SConscript5') try: - from io import UserList + from collections import UserList except ImportError: - from UserList import UserList + exec('from UserList import UserList') x7 = "SConstruct x7" x8 = "SConstruct x8" x9 = SConscript('SConscript6', UserList(["x7", "x8"])) diff --git a/test/subclassing.py b/test/subclassing.py index fc00349..b621bf5 100644 --- a/test/subclassing.py +++ b/test/subclassing.py @@ -52,9 +52,9 @@ env = my_Environment() env.Command('f0.out', 'f0.in', copy_action) try: - from io import UserString + from collections import UserString except ImportError: - from UserString import UserString + exec('from UserString import UserString') try: class mystr(str): pass |