| Message ID | 20210517184808.3562549-6-jsnow@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Python: delint python library | expand |
On Mon, May 17, 2021 at 02:48:07PM -0400, John Snow wrote: > Shift the open() call later so that the pylint pragma applies *only* to > that one open() call. Add a note that suggests why this is safe: the > resource is unconditionally cleaned up in _post_shutdown(). > > _post_shutdown is called after failed launches (see launch()), and > unconditionally after every call to shutdown(), and therefore also on > __exit__. > > Signed-off-by: John Snow <jsnow@redhat.com> > Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com> > --- > python/qemu/machine.py | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > Reviewed-by: Cleber Rosa <crosa@redhat.com>
diff --git a/python/qemu/machine.py b/python/qemu/machine.py index 2e55e2c8bd8..f021127f0fc 100644 --- a/python/qemu/machine.py +++ b/python/qemu/machine.py @@ -308,7 +308,6 @@ def _pre_launch(self) -> None: self._temp_dir = tempfile.mkdtemp(prefix="qemu-machine-", dir=self._test_dir) self._qemu_log_path = os.path.join(self._temp_dir, self._name + ".log") - self._qemu_log_file = open(self._qemu_log_path, 'wb') if self._console_set: self._remove_files.append(self._console_address) @@ -323,6 +322,11 @@ def _pre_launch(self) -> None: nickname=self._name ) + # NOTE: Make sure any opened resources are *definitely* freed in + # _post_shutdown()! + # pylint: disable=consider-using-with + self._qemu_log_file = open(self._qemu_log_path, 'wb') + def _post_launch(self) -> None: if self._qmp_connection: self._qmp.accept()