[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 65/72] scripts/qmp-shell: Remove too-broad-exception
From: |
John Snow |
Subject: |
[PATCH v2 65/72] scripts/qmp-shell: Remove too-broad-exception |
Date: |
Tue, 3 Nov 2020 19:35:55 -0500 |
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>
---
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 78e4eae00754..8d5845ab4815 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.26.2
- [PATCH v2 51/72] scripts/qmp-shell: remove prompt argument from read_exec_command, (continued)
- [PATCH v2 51/72] scripts/qmp-shell: remove prompt argument from read_exec_command, John Snow, 2020/11/03
- [PATCH v2 52/72] scripts/qmp-shell: move the REPL functionality into QMPShell, John Snow, 2020/11/03
- [PATCH v2 53/72] scripts/qmp-shell: Fix "FuzzyJSON" parser, John Snow, 2020/11/03
- [PATCH v2 54/72] scripts/qmp-shell: refactor QMPCompleter, John Snow, 2020/11/03
- [PATCH v2 56/72] python/qmp: add QMPObject type alias, John Snow, 2020/11/03
- [PATCH v2 59/72] scripts/qmp-shell: unprivatize 'pretty' property, John Snow, 2020/11/03
- [PATCH v2 58/72] scripts/qmp-shell: Accept SocketAddrT instead of string, John Snow, 2020/11/03
- [PATCH v2 55/72] scripts/qmp-shell: initialize completer early, John Snow, 2020/11/03
- [PATCH v2 61/72] scripts/qmp-shell: Use context manager instead of atexit, John Snow, 2020/11/03
- [PATCH v2 62/72] scripts/qmp-shell: use logging to show warnings, John Snow, 2020/11/03
- [PATCH v2 65/72] scripts/qmp-shell: Remove too-broad-exception,
John Snow <=
- [PATCH v2 66/72] scripts/qmp-shell: convert usage comment to docstring, John Snow, 2020/11/03
- [PATCH v2 63/72] scripts/qmp-shell: remove TODO, John Snow, 2020/11/03
- [PATCH v2 64/72] scripts/qmp-shell: Fix empty-transaction invocation, John Snow, 2020/11/03
- [PATCH v2 57/72] scripts/qmp-shell: add mypy types, John Snow, 2020/11/03
- [PATCH v2 60/72] python/qmp: return generic type from context manager, John Snow, 2020/11/03
- [PATCH v2 68/72] scripts/qmp-shell: make QMPShellError inherit QMPError, John Snow, 2020/11/03
- [PATCH v2 67/72] scripts/qmp-shell: remove double-underscores, John Snow, 2020/11/03
- [PATCH v2 71/72] python: add qmp-shell entry point, John Snow, 2020/11/03
- [PATCH v2 69/72] scripts/qmp-shell: add docstrings, John Snow, 2020/11/03
- [PATCH v2 70/72] scripts/qmp-shell: move to python/qemu/qmp/qmp_shell.py, John Snow, 2020/11/03