On Wed, Dec 15, 2021 at 02:39:26PM -0500, John Snow wrote:
> Remove the QEMU_PYTHON_LEGACY_QMP environment variable, making the
> switch permanent. Update Exceptions and import paths as necessary.
>
> Signed-off-by: John Snow <js...@redhat.com>
> ---
> python/qemu/machine/machine.py | 18 +++++++-----------
> python/qemu/machine/qtest.py | 2 +-
> 2 files changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
> index 67ab06ca2b..21fb4a4f30 100644
> --- a/python/qemu/machine/machine.py
> +++ b/python/qemu/machine/machine.py
> @@ -40,21 +40,16 @@
> TypeVar,
> )
>
> -from qemu.qmp import ( # pylint: disable=import-error
> +from qemu.aqmp import SocketAddrT
> +from qemu.aqmp.legacy import (
> + QEMUMonitorProtocol,
> QMPMessage,
> QMPReturnValue,
> - SocketAddrT,
> )
>
> from . import console_socket
>
>
> -if os.environ.get('QEMU_PYTHON_LEGACY_QMP'):
> - from qemu.qmp import QEMUMonitorProtocol
> -else:
> - from qemu.aqmp.legacy import QEMUMonitorProtocol
> -
> -
> LOG = logging.getLogger(__name__)
>
>
> @@ -710,8 +705,9 @@ def events_wait(self,
> :param timeout: Optional timeout, in seconds.
> See QEMUMonitorProtocol.pull_event.
>
> - :raise QMPTimeoutError: If timeout was non-zero and no matching
> events
> - were found.
> + :raise asyncio.TimeoutError:
> + If timeout was non-zero and no matching events were found.
> +
> :return: A QMP event matching the filter criteria.
> If timeout was 0 and no event matched, None.
> """
> @@ -734,7 +730,7 @@ def _match(event: QMPMessage) -> bool:
> event = self._qmp.pull_event(wait=timeout)
> if event is None:
> # NB: None is only returned when timeout is false-ish.
> - # Timeouts raise QMPTimeoutError instead!
> + # Timeouts raise asyncio.TimeoutError instead!
> break
> if _match(event):
> return event
> diff --git a/python/qemu/machine/qtest.py b/python/qemu/machine/qtest.py
> index f2f9aaa5e5..817c8a5425 100644
> --- a/python/qemu/machine/qtest.py
> +++ b/python/qemu/machine/qtest.py
> @@ -26,7 +26,7 @@
> TextIO,
> )
>
> -from qemu.qmp import SocketAddrT # pylint: disable=import-error
> +from qemu.aqmp.protocol import SocketAddrT
>
> from .machine import QEMUMachine
>
Reviewed-by: Beraldo Leal <bl...@redhat.com>
--
Beraldo
