[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/3] python/qemu/qmp.py: re-raise OSError when encountered
From: |
John Snow |
Subject: |
[PATCH 2/3] python/qemu/qmp.py: re-raise OSError when encountered |
Date: |
Fri, 9 Oct 2020 13:51:22 -0400 |
Nested if conditions don't change when the exception block fires; we
need to explicitly re-raise the error if we didn't intend to capture and
suppress it.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/qmp.py | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/python/qemu/qmp.py b/python/qemu/qmp.py
index d911999da1f..4969e5741cb 100644
--- a/python/qemu/qmp.py
+++ b/python/qemu/qmp.py
@@ -165,14 +165,15 @@ def __get_events(self, wait: Union[bool, float] = False)
-> None:
"""
# Check for new events regardless and pull them into the cache:
- self.__sock.setblocking(False)
try:
+ self.__sock.setblocking(False)
self.__json_read()
except OSError as err:
- if err.errno == errno.EAGAIN:
- # No data available
- pass
- self.__sock.setblocking(True)
+ # EAGAIN: No data available; not critical
+ if err.errno != errno.EAGAIN:
+ raise
+ finally:
+ self.__sock.setblocking(True)
# Wait for new events, if needed.
# if wait is 0.0, this means "no wait" and is also implicitly false.
--
2.26.2
- [PATCH 0/3] python/qemu: strictly typed mypy conversion, pt3, John Snow, 2020/10/09
- [PATCH 1/3] python: add mypy config, John Snow, 2020/10/09
- [PATCH 2/3] python/qemu/qmp.py: re-raise OSError when encountered,
John Snow <=
- [PATCH 3/3] python/qemu/qmp.py: Fix settimeout operation, John Snow, 2020/10/09
- Re: [PATCH 0/3] python/qemu: strictly typed mypy conversion, pt3, John Snow, 2020/10/09
- Re: [PATCH 0/3] python/qemu: strictly typed mypy conversion, pt3, John Snow, 2020/10/12