diff options
| author | Greg Noel <GregNoel@tigris.org> | 2008-09-25 05:37:41 (GMT) |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2008-09-25 05:37:41 (GMT) |
| commit | 2bbbcad8e9e21b58b486128b969e6fdcbe592af2 (patch) | |
| tree | 1490fe1646eb436279dec28703c145bfd7eaf395 /src/engine | |
| parent | 30c14a0e6f6a89d0fcea40957c8af3f410a32a3e (diff) | |
| download | SCons-2bbbcad8e9e21b58b486128b969e6fdcbe592af2.zip SCons-2bbbcad8e9e21b58b486128b969e6fdcbe592af2.tar.gz SCons-2bbbcad8e9e21b58b486128b969e6fdcbe592af2.tar.bz2 | |
Change FUTURE markers to TODO(1.5) so we are all using the same style.
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Environment.py | 2 | ||||
| -rw-r--r-- | src/engine/SCons/Node/FSTests.py | 1 | ||||
| -rw-r--r-- | src/engine/SCons/Scanner/LaTeX.py | 2 | ||||
| -rw-r--r-- | 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 cbf0d17..affe91e 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 8854ff9..4081a7a 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 2c3776e..358527a 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 4a82d9f..3e577fb 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 |