From 2ce386cd86ee138844bef342e334db532832eda4 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Mon, 22 Sep 2003 19:32:13 +0000 Subject: [PATCH] Pre-Python 2 portability fix in new tex.py tool. Portability fix in EnvironmentTests.py. git-svn-id: http://scons.tigris.org/svn/scons/trunk@805 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- src/engine/SCons/EnvironmentTests.py | 2 +- src/engine/SCons/Tool/tex.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py index 36f4112c..d0e8a37e 100644 --- a/src/engine/SCons/EnvironmentTests.py +++ b/src/engine/SCons/EnvironmentTests.py @@ -1357,7 +1357,7 @@ class EnvironmentTestCase(unittest.TestCase): def __init__(self): self.list = [] def Repository(self, *dirs): - self.list.extend(dirs) + self.list.extend(list(dirs)) def Dir(self, name): return name env = Environment(FOO='rrr', BAR='sss') diff --git a/src/engine/SCons/Tool/tex.py b/src/engine/SCons/Tool/tex.py index b9a8dea3..d1a8b095 100644 --- a/src/engine/SCons/Tool/tex.py +++ b/src/engine/SCons/Tool/tex.py @@ -78,11 +78,12 @@ def TeXLaTeXAction(target = None, source= None, env=None): """A builder for TeX and LaTeX that scans the source file to decide the "flavor" of the source and then executes the appropriate program.""" - LaTeXFile = False + LaTeXFile = None for src in source: content = src.get_contents() if re.search("\\\\document(style|class)",content): - LaTeXFile = True + LaTeXFile = 1 + break if LaTeXFile: LaTeXAuxAction(target,source,env) else: -- 2.26.2