SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Python Pull request

Browse Source 
This fixes the check-python-tox job.
 
 CI including optional jobs is all green:
 https://gitlab.com/jsnow/qemu/-/pipelines/372151147
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+ber27ys35W+dsvQfe+BBqr8OQ4FAmFDv68ACgkQfe+BBqr8
 OQ5igRAAgk6lnJ2xpBoMZtq3k5A25Oy5Qm2WKgYaR9dGZv/Ly0Be68asajWF8UJ1
 L436QtcUNsRx11BFV2/IcifseoXBuMDSM1IeflKGtF6b6P/LaO9XTVy9nxC92S7W
 JgcojnzJNjTrvohimBdjRLhyYePVvZYdjSYRqAqiHd1K7G1DiFIFv3JCunZHWZv0
 XpKNS5vT5ff2ASv+7+L07U4y14CuwRROORAofnESx+7quDvVJK0U4sZrWl/0peda
 XWIb+7CY2e32i5BQjVP2RKSNzAbDqGBKPwEOVl/QRGDkx0y1q1JeH0CuoxBvR9lY
 aNu6CSqfPhulrgMLsm4qzc0n8NJ4HICH2Ck662anUkuLJQ133vJR9ZYMtLTmXajF
 Ov1cFpRP5Wymc3OROfEXXsAt7B5zganE7l0zkbwnkvt3MTsmw/w+34ttiDyDMEc2
 Gvuh78z4lUryIlww1PxczuJPqyL6OauxYw/1FSd514t6FunlZ4fIjXVaLm9c6qFf
 ytTfOQgonSTOLmpTCJHpUtWUoGbG6D/+t0wlh6uJUkJGdkMiVTLfq7fUvSFnVKv0
 fo8L5/bsvSlFfoXksAtlqk5gVCLa8504JhFBrZydfW3ChT1CVyelGYRpGO5BAPBX
 HGbpNav8AKsQhRNFPu4UBEf/OdFtFwH86giOJ+EtIfPE2NO1EYo=
 =/zxo
 -----END PGP SIGNATURE-----

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

Python Pull request

This fixes the check-python-tox job.

CI including optional jobs is all green:
https://gitlab.com/jsnow/qemu/-/pipelines/372151147

# gpg: Signature made Thu 16 Sep 2021 23:05:35 BST
# 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:
  python: pylint 2.11 support
  python: Update for pylint 2.10

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2021-09-20 14:20:03 +01:00
commit c3f76fbca6
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/qemu/machine/machine.py
View File

@ -19,6 +19,7 @@ which provides facilities for managing the lifetime of a QEMU VM.
import errno import errno
from itertools import chain from itertools import chain
import locale
import logging import logging
import os import os
import shutil import shutil
@ -290,8 +291,12 @@ class QEMUMachine:
return self._subp.pid return self._subp.pid
def _load_io_log(self) -> None: def _load_io_log(self) -> None:
# Assume that the output encoding of QEMU's terminal output is
# defined by our locale. If indeterminate, allow open() to fall
# back to the platform default.
_, encoding = locale.getlocale()
if self._qemu_log_path is not None: if self._qemu_log_path is not None:
with open(self._qemu_log_path, "r") as iolog: with open(self._qemu_log_path, "r", encoding=encoding) as iolog:
self._iolog = iolog.read() self._iolog = iolog.read()
@property @property

3
python/setup.cfg
View File

@ -87,7 +87,7 @@ ignore_missing_imports = True
# --enable=similarities". If you want to run only the classes checker, but have # --enable=similarities". If you want to run only the classes checker, but have
# no Warning level messages displayed, use "--disable=all --enable=classes # no Warning level messages displayed, use "--disable=all --enable=classes
# --disable=W". # --disable=W".
disable= disable=consider-using-f-string,
[pylint.basic] [pylint.basic]
# Good variable names which should always be accepted, separated by a comma. # Good variable names which should always be accepted, separated by a comma.
@ -104,6 +104,7 @@ good-names=i,
[pylint.similarities] [pylint.similarities]
# Ignore imports when computing similarities. # Ignore imports when computing similarities.
ignore-imports=yes ignore-imports=yes
ignore-signatures=yes
# Minimum lines number of a similarity. # Minimum lines number of a similarity.
# TODO: Remove after we opt in to Pylint 2.8.3. See commit msg. # TODO: Remove after we opt in to Pylint 2.8.3. See commit msg.