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

diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py
index 36f4112c95e1412f587f5efc5bb4b9e5bebeb1ea..d0e8a37eff0969780d45c9d7f6e6db052e9951b1 100644 (file)
--- 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 b9a8dea3dbf4da26d90f6644c9b71cc39931a66a..d1a8b0956349ca4a5c593170ae33c7bcb1d9aeee 100644 (file)
--- 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: