diff options
| author | Dirk Baechle <dl9obn@darc.de> | 2014-07-29 22:34:37 (GMT) |
|---|---|---|
| committer | Dirk Baechle <dl9obn@darc.de> | 2014-07-29 22:34:37 (GMT) |
| commit | 67f3f8950bb1076382d816e859026018974ee132 (patch) | |
| tree | 5ca20b55e848440e286dec5d233cb23d1671f47e /src/engine | |
| parent | dfaf4c269aeb774c933fd9ed7e9a3b5aaa6d191a (diff) | |
| parent | c83fbe751e3a3d0f8e44eb97f9584f518b3a2b66 (diff) | |
| download | SCons-67f3f8950bb1076382d816e859026018974ee132.zip SCons-67f3f8950bb1076382d816e859026018974ee132.tar.gz SCons-67f3f8950bb1076382d816e859026018974ee132.tar.bz2 | |
Merged in manuelnaranjo/scons (pull request #159), added default for BUILDERS envvar
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/SCons/Environment.py | 6 | ||||
| -rw-r--r-- | src/engine/SCons/EnvironmentTests.py | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index d178f49..7789855 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -1378,10 +1378,8 @@ class Base(SubstitutionEnvironment): (like a function). There are no references to any mutable objects in the original Environment. """ - try: - builders = self._dict['BUILDERS'] - except KeyError: - pass + + builders = self._dict.get('BUILDERS', {}) clone = copy.copy(self) # BUILDERS is not safe to do a simple copy diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py index 5235342..b9ef3f2 100644 --- a/src/engine/SCons/EnvironmentTests.py +++ b/src/engine/SCons/EnvironmentTests.py @@ -1892,6 +1892,11 @@ def generate(env): env = env.Clone(KEY_THAT_I_WANT=6, tools=[my_tool]) assert env['KEY_THAT_I_WANT'] == real_value[0], env['KEY_THAT_I_WANT'] + # test for pull request #150 + env = self.TestEnvironment() + env._dict.pop('BUILDERS') + assert env.has_key('BUILDERS') is False + env2 = env.Clone() def test_Copy(self): """Test copying using the old env.Copy() method""" |