summaryrefslogtreecommitdiffstats
path: root/test/subclassing.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 /test/subclassing.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 'test/subclassing.py')
-rw-r--r--test/subclassing.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/subclassing.py b/test/subclassing.py
index 655de51..fc00349 100644
--- a/test/subclassing.py
+++ b/test/subclassing.py
@@ -51,7 +51,10 @@ class my_Environment(Environment):
env = my_Environment()
env.Command('f0.out', 'f0.in', copy_action)
-from UserString import UserString
+try:
+ from io import UserString
+except ImportError:
+ from UserString import UserString
try:
class mystr(str):
pass