From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Daniel P . Berrangé" <berrange@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"John Snow" <jsnow@redhat.com>,
"G S Niteesh Babu" <niteesh.gs@gmail.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Eric Blake" <eblake@redhat.com>
Subject: [PATCH v3 1/1] python: Update for pylint 2.10
Date: Wed, 15 Sep 2021 11:40:31 -0400 [thread overview]
Message-ID: <20210915154031.321592-2-jsnow@redhat.com> (raw)
In-Reply-To: <20210915154031.321592-1-jsnow@redhat.com>
A few new annoyances. Of note is the new warning for an unspecified
encoding when opening a text file, which actually does indicate a
potentially real problem; see
https://www.python.org/dev/peps/pep-0597/#motivation
Use LC_CTYPE to determine an encoding to use for interpreting QEMU's
terminal output. Note that Python states: "language code and encoding
may be None if their values cannot be determined" -- use a platform
default as a backup.
Signed-off-by: John Snow <jsnow@redhat.com>
---
python/qemu/machine/machine.py | 9 ++++++++-
python/setup.cfg | 1 +
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/python/qemu/machine/machine.py b/python/qemu/machine/machine.py
index a7081b1845..51b6e79a13 100644
--- a/python/qemu/machine/machine.py
+++ b/python/qemu/machine/machine.py
@@ -19,6 +19,7 @@
import errno
from itertools import chain
+import locale
import logging
import os
import shutil
@@ -290,8 +291,14 @@ def get_pid(self) -> Optional[int]:
return self._subp.pid
def _load_io_log(self) -> None:
+ # Assume that the output encoding of QEMU's terminal output
+ # is defined by our locale. If indeterminate, use a platform default.
+ _, encoding = locale.getlocale()
+ if encoding is None:
+ encoding = locale.getpreferredencoding(do_setlocale=False)
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()
@property
diff --git a/python/setup.cfg b/python/setup.cfg
index 83909c1c97..0f0cab098f 100644
--- a/python/setup.cfg
+++ b/python/setup.cfg
@@ -104,6 +104,7 @@ good-names=i,
[pylint.similarities]
# Ignore imports when computing similarities.
ignore-imports=yes
+ignore-signatures=yes
# Minimum lines number of a similarity.
# TODO: Remove after we opt in to Pylint 2.8.3. See commit msg.
--
2.31.1
next prev parent reply other threads:[~2021-09-15 15:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-15 15:40 [PATCH v3 0/1] Update check-python-tox test for pylint 2.10 John Snow
2021-09-15 15:40 ` John Snow [this message]
2021-09-16 12:59 ` [PATCH v3 1/1] python: Update " Daniel P. Berrangé
2021-09-16 13:42 ` John Snow
2021-09-16 15:39 ` Daniel P. Berrangé
2021-09-16 15:40 ` John Snow
2021-09-16 17:46 ` John Snow
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210915154031.321592-2-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=berrange@redhat.com \
--cc=crosa@redhat.com \
--cc=eblake@redhat.com \
--cc=ehabkost@redhat.com \
--cc=niteesh.gs@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).