Python 2.2 portability (no .pop() method on dictionaries, ' in '

doesn't search for substrings).

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3456 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Scanner/LaTeX.py b/src/engine/SCons/Scanner/LaTeX.py
index fca845bf635e20ea5ba7cb71418a2f24580565f0..2c3776e3c186cb25abb0c87d1e249149ff547ceb 100644 (file)
--- a/src/engine/SCons/Scanner/LaTeX.py
+++ b/src/engine/SCons/Scanner/LaTeX.py
@@ -146,7 +146,7 @@ class LaTeX(SCons.Scanner.Base):
                 self.suffixes = suffixes
             def __call__(self, node, env):
                 current = not node.has_builder() or node.is_up_to_date()
-                scannable = node.get_suffix() in env.subst(self.suffixes)
+                scannable = node.get_suffix() in env.subst_list(self.suffixes)[0]
                 # Returning false means that the file is not scanned.
                 return scannable and current
 

diff --git a/src/engine/SCons/Tool/tex.py b/src/engine/SCons/Tool/tex.py
index 72d925bbdd436d56d6172cd7f2a2f48685cb8b5e..7867b396b96f6745a40f340e094ed58e379fde9d 100644 (file)
--- a/src/engine/SCons/Tool/tex.py
+++ b/src/engine/SCons/Tool/tex.py
@@ -341,7 +341,7 @@ def InternalLaTeXAuxAction(XXXLaTeXAction, target = None, source= None, env=None
             continue
         if saved_env[var] is _null:
             try:
-                env['ENV'].pop(var)
+                del env['ENV'][var]
             except KeyError:
                 pass # was never set
         else: