rtems/rtems-tools
1
0
Fork 0
mirror of https://git.rtems.org/rtems-tools/ synced 2025-10-23 00:46:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

rtemstoolkit: Fix conditions using "is" with literals

Browse Source 
Fix warnings that come from python 3.8 about using the "is" operator with
string literals.

Closes #4700
This commit is contained in:
Ryan Long
2022-08-11 13:54:07 -05:00
committed by Joel Sherrill
parent 1cd476e155
commit f3d9c87958
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtemstoolkit/config.py
View File

@@ -127,7 +127,7 @@ class file(object):
self.opts.set_dry_run() self.opts.set_dry_run()
def _label(self, name): def _label(self, name):
if name.startswith('%{') and name[-1] is '}': if name.startswith('%{') and name[-1] == '}':
return name return name
return '%{' + name.lower() + '}' return '%{' + name.lower() + '}'

58
rtemstoolkit/macros.py
View File

@@ -260,7 +260,7 @@ class macros:
return [rm[7:] for rm in self.read_maps] return [rm[7:] for rm in self.read_maps]
def key_filter(self, key): def key_filter(self, key):
if key.startswith('%{') and key[-1] is '}': if key.startswith('%{') and key[-1] == '}':
key = key[2:-1] key = key[2:-1]
return key.lower() return key.lower()
@@ -295,29 +295,29 @@ class macros:
print(']]]]]]]] c:%s(%d) s:%s t:"%s" m:%r M:%s' % \ print(']]]]]]]] c:%s(%d) s:%s t:"%s" m:%r M:%s' % \
(c, ord(c), state, token, macro, map)) (c, ord(c), state, token, macro, map))
l_remaining = l_remaining[1:] l_remaining = l_remaining[1:]
if c is '#' and not state.startswith('value'): if c == '#' and not state.startswith('value'):
break break
if c == '\n' or c == '\r': 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'): not state.startswith('value-multiline'):
self.macros = orig_macros self.macros = orig_macros
raise error.general('malformed macro line:%d: %s' % (lc, l)) 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 not in string.whitespace:
if c is '[': if c == '[':
state = 'map' state = 'map'
elif c is '%': elif c == '%':
state = 'directive' state = 'directive'
elif c is ':': elif c == ':':
macro += [token] macro += [token]
token = '' token = ''
state = 'attribs' state = 'attribs'
elif c is '#': elif c == '#':
break break
else: else:
token += c token += c
elif state is 'map': elif state == 'map':
if c is ']': if c == ']':
if token not in self.macros: if token not in self.macros:
self.macros[token] = {} self.macros[token] = {}
map = token map = token
@@ -328,7 +328,7 @@ class macros:
else: else:
self.macros = orig_macros self.macros = orig_macros
raise error.general('invalid macro map:%d: %s' % (lc, l)) raise error.general('invalid macro map:%d: %s' % (lc, l))
elif state is 'directive': elif state == 'directive':
if c in string.whitespace: if c in string.whitespace:
if token == 'include': if token == 'include':
self.load(_clean(l_remaining)) self.load(_clean(l_remaining))
@@ -340,7 +340,7 @@ class macros:
else: else:
self.macros = orig_macros self.macros = orig_macros
raise error.general('invalid macro directive:%d: %s' % (lc, l)) raise error.general('invalid macro directive:%d: %s' % (lc, l))
elif state is 'include': elif state == 'include':
if c is string.whitespace: if c is string.whitespace:
if token == 'include': if token == 'include':
state = 'include' state = 'include'
@@ -349,49 +349,49 @@ class macros:
else: else:
self.macros = orig_macros self.macros = orig_macros
raise error.general('invalid macro directive:%d: %s' % (lc, l)) 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 not in string.whitespace:
if c is ',': if c == ',':
macro += [token] macro += [token]
token = '' token = ''
if len(macro) == 3: if len(macro) == 3:
state = 'value-start' state = 'value-start'
else: else:
token += c token += c
elif state is 'value-start': elif state == 'value-start':
if c is "'": if c == "'":
state = 'value-line-start' state = 'value-line-start'
elif state is 'value-line-start': elif state == 'value-line-start':
if c is "'": if c == "'":
state = 'value-multiline-start' state = 'value-multiline-start'
else: else:
state = 'value-line' state = 'value-line'
token += c token += c
elif state is 'value-multiline-start': elif state == 'value-multiline-start':
if c is "'": if c == "'":
state = 'value-multiline' state = 'value-multiline'
else: else:
macro += [token] macro += [token]
state = 'macro' state = 'macro'
elif state is 'value-line': elif state == 'value-line':
if c is "'": if c == "'":
macro += [token] macro += [token]
state = 'macro' state = 'macro'
else: else:
token += c token += c
elif state is 'value-multiline': elif state == 'value-multiline':
if c is "'": if c == "'":
state = 'value-multiline-end' state = 'value-multiline-end'
else: else:
token += c token += c
elif state is 'value-multiline-end': elif state == 'value-multiline-end':
if c is "'": if c == "'":
state = 'value-multiline-end-end' state = 'value-multiline-end-end'
else: else:
state = 'value-multiline' state = 'value-multiline'
token += "'" + c token += "'" + c
elif state is 'value-multiline-end-end': elif state == 'value-multiline-end-end':
if c is "'": if c == "'":
macro += [token] macro += [token]
state = 'macro' state = 'macro'
else: else:
@@ -400,7 +400,7 @@ class macros:
else: else:
self.macros = orig_macros self.macros = orig_macros
raise error.internal('bad state: %s' % (state)) raise error.internal('bad state: %s' % (state))
if state is 'macro': if state == 'macro':
self.macros[map][macro[0].lower()] = (macro[1], macro[2], macro[3]) self.macros[map][macro[0].lower()] = (macro[1], macro[2], macro[3])
macro = [] macro = []
token = '' token = ''