- fixed several tests and tools that still used Node attributes directly

  (found by disabling the __getattr__ in Node/FS.py)

7 files changed, 10 insertions, 10 deletions

diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py
index 2624946..a084bc4 100644
--- a/src/engine/SCons/Tool/link.py
+++ b/src/engine/SCons/Tool/link.py
@@ -86,7 +86,7 @@ def shlib_emitter(target, source, env):
             # the version number
             target[0].attributes.shlibname = version_names[0]
             shlib = env.File(version_names[0], directory=target[0].get_dir())
-            target[0].attributes.shlibpath = shlib.path
+            target[0].attributes.shlibpath = shlib.get_internal_path()
             for name in version_names[1:]:
                 env.SideEffect(name, shlib)
                 env.Clean(shlib, name)
diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py
index 8b74cf4..355eeed 100644
--- a/src/engine/SCons/Tool/msvs.py
+++ b/src/engine/SCons/Tool/msvs.py
@@ -1983,7 +1983,7 @@ def generate(env):
         env['MSVSSCONSCRIPT'] = default_MSVS_SConscript
 
     env['MSVSSCONS'] = '"%s" -c "%s"' % (python_executable, getExecScriptMain(env))
-    env['MSVSSCONSFLAGS'] = '-C "${MSVSSCONSCRIPT.dir.abspath}" -f ${MSVSSCONSCRIPT.name}'
+    env['MSVSSCONSFLAGS'] = '-C "${MSVSSCONSCRIPT.dir.get_abspath()}" -f ${MSVSSCONSCRIPT.name}'
     env['MSVSSCONSCOM'] = '$MSVSSCONS $MSVSSCONSFLAGS'
     env['MSVSBUILDCOM'] = '$MSVSSCONSCOM "$MSVSBUILDTARGET"'
     env['MSVSREBUILDCOM'] = '$MSVSSCONSCOM "$MSVSBUILDTARGET"'
diff --git a/test/Glob/Repository.py b/test/Glob/Repository.py
index 0a2e326..22a7f88 100644
--- a/test/Glob/Repository.py
+++ b/test/Glob/Repository.py
@@ -75,7 +75,7 @@ test.write(['repository', 'src', 'SConscript'], """
 Import("env")
 env.Build('xxx.out', Glob('x*.in'))
 env.Build('yyy.out', Glob('yy?.in'))
-env.Build('zzz.out', sorted(Glob('*/zzz.in'), key=lambda t: t.abspath))
+env.Build('zzz.out', sorted(Glob('*/zzz.in'), key=lambda t: t.get_abspath()))
 """)
 
 test.write(['repository', 'src', 'xxx.in'], "repository/src/xxx.in\n")
diff --git a/test/Glob/exclude.py b/test/Glob/exclude.py
index 56b58a8..fe93b82 100644
--- a/test/Glob/exclude.py
+++ b/test/Glob/exclude.py
@@ -46,9 +46,9 @@ def concatenate(target, source, env):
 
 env['BUILDERS']['Concatenate'] = Builder(action=concatenate)
 
-env.Concatenate('fa.out', sorted(Glob('f*.in'   , exclude=['f2.in', 'f4.*']   , strings=False), key=lambda t: t.path))
+env.Concatenate('fa.out', sorted(Glob('f*.in'   , exclude=['f2.in', 'f4.*']   , strings=False), key=lambda t: t.get_internal_path()))
 env.Concatenate('fb.out', sorted(Glob('f*.in'   , exclude=['f2.in', 'f4.*']   , strings=True)))
-env.Concatenate('fc.out', sorted(Glob('d?/f*.in', exclude=['d?/f1.*', 'f2.in'], strings=False), key=lambda t: t.path))
+env.Concatenate('fc.out', sorted(Glob('d?/f*.in', exclude=['d?/f1.*', 'f2.in'], strings=False), key=lambda t: t.get_internal_path()))
 env.Concatenate('fd.out', sorted(Glob('d?/f*.in', exclude=['d?/f1.*', 'f2.in'], strings=True)))
 env.Concatenate('fe.out', sorted(Glob('f*.in',    exclude='f1.in'             , strings=True)))
 env.Concatenate('ff.out', sorted(Glob('f*.in',    exclude='other'             , strings=True)))
diff --git a/test/Interactive/variant_dir.py b/test/Interactive/variant_dir.py
index f36bd0a..7f2c42f 100644
--- a/test/Interactive/variant_dir.py
+++ b/test/Interactive/variant_dir.py
@@ -41,10 +41,10 @@ marker_2 = test.workpath('markers', '2')
 
 test.write(['work', 'SConstruct'], """\
 # build the plugin binaries
-basepath = str(Dir('#').abspath)
+basepath = str(Dir('#').get_abspath())
 env = Environment()
 env.Append(BASEPATH=basepath)
-env.Append(ENV = {'BASEPATH' : str(Dir('#').abspath)})
+env.Append(ENV = {'BASEPATH' : str(Dir('#').get_abspath())})
 SConscript( 'sub1/SConscript',
             variant_dir = 'build', 
             duplicate=False, 
diff --git a/test/option/md5-chunksize.py b/test/option/md5-chunksize.py
index 375208d..dbb2615 100644
--- a/test/option/md5-chunksize.py
+++ b/test/option/md5-chunksize.py
@@ -104,8 +104,8 @@ get_stat(["test.stat"], ["test.big"])
 test2.write('SConstruct', """
 import os
 def get_stat(target, source, env):
-    stat = os.stat(source[0].abspath)
-    dest = open(target[0].abspath,'w')
+    stat = os.stat(source[0].get_abspath())
+    dest = open(target[0].get_abspath(),'w')
     dest.write(str(stat))
     dest.close()
 env = Environment()
diff --git a/test/site_scons/sysdirs.py b/test/site_scons/sysdirs.py
index c05ef67..f50485a 100644
--- a/test/site_scons/sysdirs.py
+++ b/test/site_scons/sysdirs.py
@@ -39,7 +39,7 @@ test = TestSCons.TestSCons()
 

 test.write('SConstruct', """

 import SCons.Script

-SCons.Script.Main.test_load_all_site_scons_dirs(Dir('.').path)

+SCons.Script.Main.test_load_all_site_scons_dirs(Dir('.').get_internal_path())

 """)

 

 test.run(arguments = '-Q .')