mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts/qmp-shell: remove if-raise-else patterns

Browse Source 
Shushes pylint. I don't always mind these patterns personally, but I'm
not as sure that I want to remove the warning from pylint's repertoire
entirely. Oh well.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20210607200649.1840382-16-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
John Snow 2021-06-07 16:06:22 -04:00
parent d962ec85ed
commit 73f699c903
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/qmp/qmp-shell
View File

@ -204,8 +204,7 @@ class QMPShell(qmp.QEMUMonitorProtocol):
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'
raise QMPShellError(msg.format('.'.join(curpath))) raise QMPShellError(msg.format('.'.join(curpath)))
else: raise QMPShellError(f'Cannot set "{key}" multiple times')
raise QMPShellError(f'Cannot set "{key}" multiple times')
parent[optpath[-1]] = value parent[optpath[-1]] = value
def __build_cmd(self, cmdline): def __build_cmd(self, cmdline):
@ -309,13 +308,14 @@ class QMPShell(qmp.QEMUMonitorProtocol):
except EOFError: except EOFError:
print() print()
return False return False
if cmdline == '': if cmdline == '':
for event in self.get_events(): for event in self.get_events():
print(event) print(event)
self.clear_events() self.clear_events()
return True return True
else:
return self._execute_cmd(cmdline) return self._execute_cmd(cmdline)
def set_verbosity(self, verbose): def set_verbosity(self, verbose):
self._verbose = verbose self._verbose = verbose