diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 13:30:12 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-23 13:30:12 +0200 |
| commit | 7b1d732af9a59f0e1b1261c90340d8e11b2f96d3 (patch) | |
| tree | 0976d211d18e04de0f50b54aaa54a82db038af8e /engine/SCons/Subst.py | |
| parent | 77340fd25f9cdc798fc2ea9d89ab3e3d16bf7882 (diff) | |
| parent | 9c04223086bf606eaac6dc2848af80518210d823 (diff) | |
Update upstream source from tag 'upstream/3.1.0'
Update to upstream version '3.1.0'
with Debian dir 248b875f378ce1bab3315f6ed2cecdf63a4cc3cc
Diffstat (limited to 'engine/SCons/Subst.py')
| -rw-r--r-- | engine/SCons/Subst.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/SCons/Subst.py b/engine/SCons/Subst.py index 5fae669..1e0d423 100644 --- a/engine/SCons/Subst.py +++ b/engine/SCons/Subst.py @@ -26,7 +26,7 @@ SCons string substitution. # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -__revision__ = "src/engine/SCons/Subst.py a56bbd8c09fb219ab8a9673330ffcd55279219d0 2019-03-26 23:16:31 bdeegan" +__revision__ = "src/engine/SCons/Subst.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan" import collections import re @@ -350,7 +350,7 @@ _rm_split = re.compile(r'(?<!\$)(\$[()])') _regex_remove = [ _rm, None, _rm_split ] def _rm_list(list): - return [l for l in list if not l in ('$(', '$)')] + return [l for l in list if l not in ('$(', '$)')] def _remove_list(list): result = [] @@ -468,7 +468,7 @@ def scons_subst(strSubst, env, mode=SUBST_RAW, target=None, source=None, gvars={ s = lvars[key] elif key in self.gvars: s = self.gvars[key] - elif not NameError in AllowableExceptions: + elif NameError not in AllowableExceptions: raise_exception(NameError(key), lvars['TARGETS'], s) else: return '' @@ -690,7 +690,7 @@ def scons_subst_list(strSubst, env, mode=SUBST_RAW, target=None, source=None, gv s = lvars[key] elif key in self.gvars: s = self.gvars[key] - elif not NameError in AllowableExceptions: + elif NameError not in AllowableExceptions: raise_exception(NameError(), lvars['TARGETS'], s) else: return |