[Qemu-commits] [qemu/qemu] f75b20: python/aqmp: use absolute import statement

[Peter Maydell]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: f75b20e4f16663af4c65657821c5727b1d1c2493
      
https://github.com/qemu/qemu/commit/f75b20e4f16663af4c65657821c5727b1d1c2493
  Author: John Snow <jsnow@redhat.com>
  Date:   2022-01-10 (Mon, 10 Jan 2022)

  Changed paths:
    M python/qemu/aqmp/aqmp_tui.py

  Log Message:
  -----------
  python/aqmp: use absolute import statement

pylint's dependency astroid appears to have bugs in 2.9.1 and 2.9.2 (Dec
31 and Jan 3) that appear to erroneously expect the qemu namespace to
have an __init__.py file. astroid 2.9.3 (Jan 9) avoids that problem, but
appears to not understand a relative import within a namespace package.

Update the relative import - it was worth changing anyway, because these
packages will eventually be packaged and distributed separately.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Beraldo Leal <bleal@redhat.com>
Message-id: 20220110191349.1841027-2-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>


  Commit: 42d73f2894ea1855df5a25d58e0d9eac6023dcc3
      
https://github.com/qemu/qemu/commit/42d73f2894ea1855df5a25d58e0d9eac6023dcc3
  Author: John Snow <jsnow@redhat.com>
  Date:   2022-01-10 (Mon, 10 Jan 2022)

  Changed paths:
    M python/qemu/aqmp/protocol.py

  Log Message:
  -----------
  Python/aqmp: fix type definitions for mypy 0.920

0.920 (Released 2021-12-15) is not entirely happy with the
way that I was defining _FutureT:

qemu/aqmp/protocol.py:601: error: Item "object" of the upper bound
"Optional[Future[Any]]" of type variable "_FutureT" has no attribute
"done"

Update it with something a little mechanically simpler that works better
across a wider array of mypy versions.

Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 20220110191349.1841027-3-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>


  Commit: 366d33158cea72e80d80505f94c34cb505385c0a
      
https://github.com/qemu/qemu/commit/366d33158cea72e80d80505f94c34cb505385c0a
  Author: John Snow <jsnow@redhat.com>
  Date:   2022-01-10 (Mon, 10 Jan 2022)

  Changed paths:
    M python/qemu/qmp/qom_common.py

  Log Message:
  -----------
  python: update type hints for mypy 0.930

Mypy 0.930, released Dec 22, changes the way argparse objects are
considered. Crafting a definition that works under Python 3.6 and an
older mypy alongside newer versions simultaneously is ... difficult,
so... eh. Stub it out with an 'Any' definition to get the CI moving
again.

Oh well.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Beraldo Leal <bleal@redhat.com>
Message-id: 20220110191349.1841027-4-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>


  Commit: 9ebfc5a583d8aa94bf1bc37c1f71559187fd809c
      
https://github.com/qemu/qemu/commit/9ebfc5a583d8aa94bf1bc37c1f71559187fd809c
  Author: Stefan Weil <sw@weilnetz.de>
  Date:   2022-01-10 (Mon, 10 Jan 2022)

  Changed paths:
    M scripts/simplebench/bench-example.py

  Log Message:
  -----------
  simplebench: Fix Python syntax error (reported by LGTM)

Fixes: b2fcb0c5754c2554b8406376e99a75e9e0a6b7bd
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 20220107153019.504124-1-sw@weilnetz.de
Signed-off-by: John Snow <jsnow@redhat.com>


  Commit: 7bb1272f40bdbdebcaec1737c412dcb52e414842
      
https://github.com/qemu/qemu/commit/7bb1272f40bdbdebcaec1737c412dcb52e414842
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-01-11 (Tue, 11 Jan 2022)

  Changed paths:
    M python/qemu/aqmp/aqmp_tui.py
    M python/qemu/aqmp/protocol.py
    M python/qemu/qmp/qom_common.py
    M scripts/simplebench/bench-example.py

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/jsnow-gitlab/tags/python-pull-request' 
into staging

Python pull request

Fixes for the tests that broke during vacation, plus a simple syntax fix
for a python script.

# gpg: Signature made Mon 10 Jan 2022 23:24:47 GMT
# gpg:                using RSA key F9B7ABDBBCACDF95BE76CBD07DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full]
# Primary key fingerprint: FAEB 9711 A12C F475 812F  18F2 88A9 064D 1835 61EB
#      Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76  CBD0 7DEF 8106 AAFC 390E

* remotes/jsnow-gitlab/tags/python-pull-request:
  simplebench: Fix Python syntax error (reported by LGTM)
  python: update type hints for mypy 0.930
  Python/aqmp: fix type definitions for mypy 0.920
  python/aqmp: use absolute import statement

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/64c01c7da449...7bb1272f40bd