From 526b46b95b084892b43e7c990c40395481b3b025 Mon Sep 17 00:00:00 2001 From: GregNoel Date: Thu, 25 Sep 2008 05:37:41 +0000 Subject: [PATCH] Change FUTURE markers to TODO(1.5) so we are all using the same style. git-svn-id: http://scons.tigris.org/svn/scons/trunk@3472 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- src/engine/SCons/Environment.py | 2 +- src/engine/SCons/Node/FSTests.py | 1 + src/engine/SCons/Scanner/LaTeX.py | 2 +- src/engine/SCons/Tool/tex.py | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index cbf0d17b..affe91e7 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -535,7 +535,7 @@ class SubstitutionEnvironment: # othewise force a shell if not SCons.Util.is_List(command): kw['shell'] = True # run constructed command - #FUTURE p = SCons.Action._subproc(self, command, **kw) + #TODO(1.5) p = SCons.Action._subproc(self, command, **kw) p = apply(SCons.Action._subproc, (self, command), kw) out,err = p.communicate() status = p.wait() diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py index 8854ff9d..4081a7a3 100644 --- a/src/engine/SCons/Node/FSTests.py +++ b/src/engine/SCons/Node/FSTests.py @@ -1708,6 +1708,7 @@ class DirTestCase(_tempdirTestCase): e = self.fs.Dir(os.path.join('d', 'empty')) s = self.fs.Dir(os.path.join('d', 'sub')) + #TODO(1.5) files = d.get_contents().split('\n') files = string.split(d.get_contents(), '\n') assert e.get_contents() == '', e.get_contents() diff --git a/src/engine/SCons/Scanner/LaTeX.py b/src/engine/SCons/Scanner/LaTeX.py index 2c3776e3..358527a5 100644 --- a/src/engine/SCons/Scanner/LaTeX.py +++ b/src/engine/SCons/Scanner/LaTeX.py @@ -178,7 +178,7 @@ class LaTeX(SCons.Scanner.Base): if include[0] == 'includegraphics': base, ext = os.path.splitext( filename ) if ext == "": - #FUTURE return [filename + e for e in self.graphics_extensions] + #TODO(1.5) return [filename + e for e in self.graphics_extensions] return map(lambda e, f=filename: f+e, self.graphics_extensions) return [filename] diff --git a/src/engine/SCons/Tool/tex.py b/src/engine/SCons/Tool/tex.py index 4a82d9f2..3e577fb9 100644 --- a/src/engine/SCons/Tool/tex.py +++ b/src/engine/SCons/Tool/tex.py @@ -128,11 +128,11 @@ def modify_env_var(env, var, abspath): env.PrependENVPath(var, abspath) try: if SCons.Util.is_List(env[var]): - #FUTURE env.PrependENVPath(var, [os.path.abspath(str(p)) for p in env[var]]) + #TODO(1.5) env.PrependENVPath(var, [os.path.abspath(str(p)) for p in env[var]]) env.PrependENVPath(var, map(lambda p: os.path.abspath(str(p)), env[var])) else: # Split at os.pathsep to convert into absolute path - #FUTURE env.PrependENVPath(var, [os.path.abspath(p) for p in str(env[var]).split(os.pathsep)]) + #TODO(1.5) env.PrependENVPath(var, [os.path.abspath(p) for p in str(env[var]).split(os.pathsep)]) env.PrependENVPath(var, map(lambda p: os.path.abspath(p), str(env[var]).split(os.pathsep))) except KeyError: pass -- 2.26.2