motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

scripts/qmp-shell: rename one and two-letter variables

Browse source 
A bit of churn and housekeeping for pylint, flake8 et al.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20210607200649.1840382-14-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
John Snow 2021-06-07 16:06:20 -04:00
parent 2813dee053
commit 628b92dd67
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
scripts/qmp/qmp-shell
View file

@ -176,8 +176,8 @@ class QMPShell(qmp.QEMUMonitorProtocol):
pass pass
# Try once again as FuzzyJSON: # Try once again as FuzzyJSON:
try: try:
st = ast.parse(val, mode='eval') tree = ast.parse(val, mode='eval')
return ast.literal_eval(FuzzyJSON().visit(st)) return ast.literal_eval(FuzzyJSON().visit(tree))
except SyntaxError: except SyntaxError:
pass pass
except ValueError: except ValueError:
@ -195,14 +195,14 @@ class QMPShell(qmp.QEMUMonitorProtocol):
value = self.__parse_value(val) value = self.__parse_value(val)
optpath = key.split('.') optpath = key.split('.')
curpath = [] curpath = []
for p in optpath[:-1]: for path in optpath[:-1]:
curpath.append(p) curpath.append(path)
d = parent.get(p, {}) obj = parent.get(path, {})
if type(d) is not dict: if type(obj) is not dict:
msg = 'Cannot use "{:s}" as both leaf and non-leaf key' msg = 'Cannot use "{:s}" as both leaf and non-leaf key'
raise QMPShellError(msg.format('.'.join(curpath))) raise QMPShellError(msg.format('.'.join(curpath)))
parent[p] = d parent[path] = obj
parent = d parent = obj
if optpath[-1] in parent: if optpath[-1] in parent:
if type(parent[optpath[-1]]) is dict: if type(parent[optpath[-1]]) is dict:
msg = 'Cannot use "{:s}" as both leaf and non-leaf key' msg = 'Cannot use "{:s}" as both leaf and non-leaf key'
@ -267,8 +267,8 @@ class QMPShell(qmp.QEMUMonitorProtocol):
def _execute_cmd(self, cmdline): def _execute_cmd(self, cmdline):
try: try:
qmpcmd = self.__build_cmd(cmdline) qmpcmd = self.__build_cmd(cmdline)
except Exception as e: except Exception as err:
print('Error while parsing command line: %s' % e) print('Error while parsing command line: %s' % err)
print('command format: <command-name> ', end=' ') print('command format: <command-name> ', end=' ')
print('[arg-name1=arg1] ... [arg-nameN=argN]') print('[arg-name1=arg1] ... [arg-nameN=argN]')
return True return True
@ -313,8 +313,8 @@ class QMPShell(qmp.QEMUMonitorProtocol):
print() print()
return False return False
if cmdline == '': if cmdline == '':
for ev in self.get_events(): for event in self.get_events():
print(ev) print(event)
self.clear_events() self.clear_events()
return True return True
else: else: