diff options
| author | John Snow | 2021-06-07 22:06:21 +0200 |
|---|---|---|
| committer | John Snow | 2021-06-18 22:10:06 +0200 |
| commit | d962ec85ed188b04f35a28771c69845f09a3867e (patch) | |
| tree | dd22ce353352579163486f15ff5150df6a3d959e /scripts | |
| parent | scripts/qmp-shell: rename one and two-letter variables (diff) | |
| download | qemu-d962ec85ed188b04f35a28771c69845f09a3867e.tar.gz qemu-d962ec85ed188b04f35a28771c69845f09a3867e.tar.xz qemu-d962ec85ed188b04f35a28771c69845f09a3867e.zip | |
scripts/qmp-shell: fix shell history exception handling
We want to remove exceptions that are too broad here; we only want to
catch IOErrors that get raised as a direct result of the open call.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20210607200649.1840382-15-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/qmp/qmp-shell | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/scripts/qmp/qmp-shell b/scripts/qmp/qmp-shell index afb4b0c544..80cd432607 100755 --- a/scripts/qmp/qmp-shell +++ b/scripts/qmp/qmp-shell @@ -67,7 +67,6 @@ import ast import atexit -import errno import json import os import re @@ -143,19 +142,17 @@ class QMPShell(qmp.QEMUMonitorProtocol): readline.set_completer_delims('') try: readline.read_history_file(self._histfile) - except Exception as e: - if isinstance(e, IOError) and e.errno == errno.ENOENT: - # File not found. No problem. - pass - else: - print("Failed to read history '%s'; %s" % (self._histfile, e)) + except FileNotFoundError: + pass + except IOError as err: + print(f"Failed to read history '{self._histfile}': {err!s}") atexit.register(self.__save_history) def __save_history(self): try: readline.write_history_file(self._histfile) - except Exception as e: - print("Failed to save history file '%s'; %s" % (self._histfile, e)) + except IOError as err: + print(f"Failed to save history file '{self._histfile}': {err!s}") @classmethod def __parse_value(cls, val): |