From 0c7965c093c16fd88b0cd8bab305b82e10e3f792 Mon Sep 17 00:00:00 2001 From: Anders Montonen Date: Mon, 27 Apr 2020 22:15:26 +0300 Subject: sb: Fix Python literal comparison warnings Fixes: SyntaxWarning: "is" with a literal. Did you mean "=="? Signed-off-by: Anders Montonen --- source-builder/sb/config.py | 2 +- source-builder/sb/macros.py | 58 ++++++++++++++++++++++----------------------- 2 files changed, 30 insertions(+), 30 deletions(-) (limited to 'source-builder') diff --git a/source-builder/sb/config.py b/source-builder/sb/config.py index 4856088..afcac84 100644 --- a/source-builder/sb/config.py +++ b/source-builder/sb/config.py @@ -338,7 +338,7 @@ class file: raise error.general(self._name_line_msg(msg)) def _label(self, name): - if name.startswith('%{') and name[-1] is '}': + if name.startswith('%{') and name[-1] == '}': return name return '%{' + name.lower() + '}' diff --git a/source-builder/sb/macros.py b/source-builder/sb/macros.py index 9ba6cac..5a639b8 100644 --- a/source-builder/sb/macros.py +++ b/source-builder/sb/macros.py @@ -233,7 +233,7 @@ class macros: return [rm[5:] for rm in self.read_maps] def key_filter(self, key): - if key.startswith('%{') and key[-1] is '}': + if key.startswith('%{') and key[-1] == '}': key = key[2:-1] return key.lower() @@ -269,28 +269,28 @@ class macros: print(']]]]]]]] c:%s(%d) s:%s t:"%s" m:%r M:%s' % \ (c, ord(c), state, token, macro, map)) l_remaining = l_remaining[1:] - if c is '#' and not state.startswith('value'): + if c == '#' and not state.startswith('value'): break if c == '\n' or c == '\r': - if not (state is 'key' and len(token) == 0) and \ + if not (state == 'key' and len(token) == 0) and \ not state.startswith('value-multiline'): raise error.general('malformed macro line:%d: %s' % (lc, l)) - if state is 'key': + if state == 'key': if c not in string.whitespace: - if c is '[': + if c == '[': state = 'map' - elif c is '%': + elif c == '%': state = 'directive' - elif c is ':': + elif c == ':': macro += [token] token = '' state = 'attribs' - elif c is '#': + elif c == '#': break else: token += c - elif state is 'map': - if c is ']': + elif state == 'map': + if c == ']': if token not in macros: macros[token] = {} map = token @@ -300,7 +300,7 @@ class macros: token += c else: raise error.general('invalid macro map:%d: %s' % (lc, l)) - elif state is 'directive': + elif state == 'directive': if c in string.whitespace: if token == 'include': self.load(_clean(l_remaining)) @@ -311,7 +311,7 @@ class macros: token += c else: raise error.general('invalid macro directive:%d: %s' % (lc, l)) - elif state is 'include': + elif state == 'include': if c is string.whitespace: if token == 'include': state = 'include' @@ -319,49 +319,49 @@ class macros: token += c else: raise error.general('invalid macro directive:%d: %s' % (lc, l)) - elif state is 'attribs': + elif state == 'attribs': if c not in string.whitespace: - if c is ',': + if c == ',': macro += [token] token = '' if len(macro) == 3: state = 'value-start' else: token += c - elif state is 'value-start': - if c is "'": + elif state == 'value-start': + if c == "'": state = 'value-line-start' - elif state is 'value-line-start': - if c is "'": + elif state == 'value-line-start': + if c == "'": state = 'value-multiline-start' else: state = 'value-line' token += c - elif state is 'value-multiline-start': - if c is "'": + elif state == 'value-multiline-start': + if c == "'": state = 'value-multiline' else: macro += [token] state = 'macro' - elif state is 'value-line': - if c is "'": + elif state == 'value-line': + if c == "'": macro += [token] state = 'macro' else: token += c - elif state is 'value-multiline': - if c is "'": + elif state == 'value-multiline': + if c == "'": state = 'value-multiline-end' else: token += c - elif state is 'value-multiline-end': - if c is "'": + elif state == 'value-multiline-end': + if c == "'": state = 'value-multiline-end-end' else: state = 'value-multiline' token += "'" + c - elif state is 'value-multiline-end-end': - if c is "'": + elif state == 'value-multiline-end-end': + if c == "'": macro += [token] state = 'macro' else: @@ -369,7 +369,7 @@ class macros: token += "''" + c else: raise error.internal('bad state: %s' % (state)) - if state is 'macro': + if state == 'macro': macros[map][self._unicode_to_str(macro[0].lower())] = \ (self._unicode_to_str(macro[1]), self._unicode_to_str(macro[2]), -- cgit v1.2.3