1.5.2 portability.

2 files changed, 4 insertions, 6 deletions

diff --git a/src/engine/SCons/ActionTests.py b/src/engine/SCons/ActionTests.py
index 480b299..b7006f9 100644
--- a/src/engine/SCons/ActionTests.py
+++ b/src/engine/SCons/ActionTests.py
@@ -38,7 +38,6 @@ import sys
 import types
 import unittest
 import UserDict
-import UserString
 
 import SCons.Action
 import SCons.Environment
@@ -90,10 +89,9 @@ scons_env = SCons.Environment.Environment()
 # so it doesn't clutter the output.
 sys.stdout = StringIO.StringIO()
 
-class CmdStringHolder(UserString.UserString):
-    # Copped from SCons.Util
+class CmdStringHolder:
     def __init__(self, cmd, literal=None):
-        UserString.UserString.__init__(self, cmd)
+        self.data = str(cmd)
         self.literal = literal
 
     def is_literal(self):
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index 2fb4e93..d189ecf 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -817,7 +817,7 @@ def scons_subst_once(strSubst, env, key):
                         if a in matchlist:
                             a = env[key]
                         if is_List(a):
-                            r.extend(string.join(map(str, a)))
+                            r.append(string.join(map(str, a)))
                         else:
                             r.append(str(a))
                     result.append(string.join(r, ''))
@@ -830,7 +830,7 @@ def scons_subst_once(strSubst, env, key):
             if a in matchlist:
                 a = env[key]
             if is_List(a):
-                result.extend(string.join(map(str, a)))
+                result.append(string.join(map(str, a)))
             else:
                 result.append(str(a))
         return string.join(result, '')