From 9c8871bbd4d82336a88289b6a9e669a823665e28 Mon Sep 17 00:00:00 2001 From: stevenknight Date: Mon, 22 Sep 2008 22:25:04 +0000 Subject: [PATCH] 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 --- src/engine/SCons/Scanner/LaTeX.py | 2 +- src/engine/SCons/Tool/tex.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/SCons/Scanner/LaTeX.py b/src/engine/SCons/Scanner/LaTeX.py index fca845bf..2c3776e3 100644 --- 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 72d925bb..7867b396 100644 --- 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: -- 2.26.2