Win32 portability fixes.

3 files changed, 13 insertions, 7 deletions

diff --git a/src/engine/SCons/Node/NodeTests.py b/src/engine/SCons/Node/NodeTests.py
index 106e44e..ee0e82b 100644
--- a/src/engine/SCons/Node/NodeTests.py
+++ b/src/engine/SCons/Node/NodeTests.py
@@ -1179,7 +1179,7 @@ class NodeListTestCase(unittest.TestCase):
             assert s == "['n3', 'n2', 'n1']", s
 
         r = repr(nl)
-        r = re.sub('at (0x)?[0-9a-z]+', 'at 0x', r)
+        r = re.sub('at (0[xX])?[0-9a-fA-F]+', 'at 0x', r)
         # Don't care about ancestry: just leaf value of MyNode
         r = re.sub('<.*?\.MyNode', '<MyNode', r)
         # New-style classes report as "object"; classic classes report
diff --git a/src/engine/SCons/Util.py b/src/engine/SCons/Util.py
index d8f0a74..361b18c 100644
--- a/src/engine/SCons/Util.py
+++ b/src/engine/SCons/Util.py
@@ -614,7 +614,7 @@ def scons_subst(strSubst, env, mode=SUBST_RAW, target=None, source=None, gvars={
                                 s = eval(key, self.gvars, lvars)
                             except AttributeError, e:
                                 raise SCons.Errors.UserError, \
-                                      "Error substituting `%s': unknown attribute `%s'" % (key, e)
+                                      "Error trying to evaluate `%s': %s" % (s, e)
                             except (IndexError, NameError, TypeError):
                                 return ''
                             except SyntaxError,e:
@@ -813,7 +813,7 @@ def scons_subst_list(strSubst, env, mode=SUBST_RAW, target=None, source=None, gv
                             s = eval(key, self.gvars, lvars)
                         except AttributeError, e:
                             raise SCons.Errors.UserError, \
-                                  "Error substituting `%s': unknown attribute `%s'" % (key, e)
+                                  "Error trying to evaluate `%s': %s" % (s, e)
                         except (IndexError, NameError, TypeError):
                             return
                         except SyntaxError,e:
diff --git a/src/engine/SCons/UtilTests.py b/src/engine/SCons/UtilTests.py
index 3ae3b48..6236038 100644
--- a/src/engine/SCons/UtilTests.py
+++ b/src/engine/SCons/UtilTests.py
@@ -456,8 +456,11 @@ class UtilTestCase(unittest.TestCase):
                 pass
             scons_subst('${foo.bar}', env, gvars={'foo':Foo()})
         except SCons.Errors.UserError, e:
-            expect = "Error substituting `foo.bar': unknown attribute `bar'"
-            assert str(e) == expect, e
+            expect = [
+                "Error trying to evaluate `${foo.bar}': bar",
+                "Error trying to evaluate `${foo.bar}': Foo instance has no attribute 'bar'",
+            ]
+            assert str(e) in expect, e
         else:
             raise AssertionError, "did not catch expected UserError"
 
@@ -870,8 +873,11 @@ class UtilTestCase(unittest.TestCase):
                 pass
             scons_subst_list('${foo.bar}', env, gvars={'foo':Foo()})
         except SCons.Errors.UserError, e:
-            expect = "Error substituting `foo.bar': unknown attribute `bar'"
-            assert str(e) == expect, e
+            expect = [
+                "Error trying to evaluate `${foo.bar}': bar",
+                "Error trying to evaluate `${foo.bar}': Foo instance has no attribute 'bar'",
+            ]
+            assert str(e) in expect, e
         else:
             raise AssertionError, "did not catch expected UserError"