diff options
| author | Steven Knight <knight@baldmt.com> | 2008-09-22 22:25:04 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2008-09-22 22:25:04 (GMT) |
| commit | 12c7e9c76f954c5c3fbb14cf988b39660fcfb149 (patch) | |
| tree | 8942485ae78594b4900b36208fe807758a6d69ce | |
| parent | 8819b7a69753e5f8077c41176947c0760ebdc53b (diff) | |
| download | SCons-12c7e9c76f954c5c3fbb14cf988b39660fcfb149.zip SCons-12c7e9c76f954c5c3fbb14cf988b39660fcfb149.tar.gz SCons-12c7e9c76f954c5c3fbb14cf988b39660fcfb149.tar.bz2 | |
Python 2.2 portability (no .pop() method on dictionaries, ' in '
doesn't search for substrings).
| -rw-r--r-- | src/engine/SCons/Scanner/LaTeX.py | 2 | ||||
| -rw-r--r-- | 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 fca845b..2c3776e 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 72d925b..7867b39 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: |