[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 65/72] scripts/qmp-shell: Remove too-broad-exception
From: |
John Snow |
Subject: |
[PULL 65/72] scripts/qmp-shell: Remove too-broad-exception |
Date: |
Fri, 18 Jun 2021 19:04:48 -0400 |
We are only anticipating QMPShellErrors here, for syntax we weren't able
to understand. Other errors, if any, should be allowed to percolate
upwards.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20210607200649.1840382-36-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qmp/qmp-shell | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell
index 78e4eae007..8d5845ab48 100755
--- a/scripts/qmp/qmp-shell
+++ b/scripts/qmp/qmp-shell
@@ -291,10 +291,13 @@ class QMPShell(qmp.QEMUMonitorProtocol):
def _execute_cmd(self, cmdline: str) -> bool:
try:
qmpcmd = self.__build_cmd(cmdline)
- except Exception as err:
- print('Error while parsing command line: %s' % err)
- print('command format: <command-name> ', end=' ')
- print('[arg-name1=arg1] ... [arg-nameN=argN]')
+ except QMPShellError as err:
+ print(
+ f"Error while parsing command line: {err!s}\n"
+ "command format: <command-name> "
+ "[arg-name1=arg1] ... [arg-nameN=argN",
+ file=sys.stderr
+ )
return True
# For transaction mode, we may have just cached the action:
if qmpcmd is None:
--
2.31.1
- [PULL 59/72] scripts/qmp-shell: unprivatize 'pretty' property, (continued)
- [PULL 59/72] scripts/qmp-shell: unprivatize 'pretty' property, John Snow, 2021/06/18
- [PULL 60/72] python/qmp: return generic type from context manager, John Snow, 2021/06/18
- [PULL 64/72] scripts/qmp-shell: Fix empty-transaction invocation, John Snow, 2021/06/18
- [PULL 63/72] scripts/qmp-shell: remove TODO, John Snow, 2021/06/18
- [PULL 61/72] scripts/qmp-shell: Use context manager instead of atexit, John Snow, 2021/06/18
- [PULL 66/72] scripts/qmp-shell: convert usage comment to docstring, John Snow, 2021/06/18
- [PULL 68/72] scripts/qmp-shell: make QMPShellError inherit QMPError, John Snow, 2021/06/18
- [PULL 70/72] scripts/qmp-shell: move to python/qemu/qmp/qmp_shell.py, John Snow, 2021/06/18
- [PULL 72/72] scripts/qmp-shell: add redirection shim, John Snow, 2021/06/18
- [PULL 62/72] scripts/qmp-shell: use logging to show warnings, John Snow, 2021/06/18
- [PULL 65/72] scripts/qmp-shell: Remove too-broad-exception,
John Snow <=
- [PULL 67/72] scripts/qmp-shell: remove double-underscores, John Snow, 2021/06/18
- [PULL 69/72] scripts/qmp-shell: add docstrings, John Snow, 2021/06/18
- [PULL 71/72] python: add qmp-shell entry point, John Snow, 2021/06/18
- [PULL 58/72] scripts/qmp-shell: Accept SocketAddrT instead of string, John Snow, 2021/06/18
- Re: [PULL 00/72] Python patches, Peter Maydell, 2021/06/21