From: Eduardo Habkost <ehabkost@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eduardo Habkost" <ehabkost@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
qemu-block@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
"Juan Quintela" <quintela@redhat.com>,
"Fam Zheng" <famz@redhat.com>, "Kevin Wolf" <kwolf@redhat.com>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Max Reitz" <mreitz@redhat.com>,
"Daniel P. Berrange" <berrange@redhat.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>
Subject: [Qemu-devel] [PATCH v2 05/10] python: futurize -f lib2to3.fixes.fix_standarderror
Date: Fri, 8 Jun 2018 09:29:47 -0300 [thread overview]
Message-ID: <20180608122952.2009-6-ehabkost@redhat.com> (raw)
In-Reply-To: <20180608122952.2009-1-ehabkost@redhat.com>
Rename StandardError to Exception.
This is necessary for Python 3 compatibility.
Done using:
$ py=$( (g grep -l -E '^#!.*python';find -name '*.py' -printf '%P\n';) | \
sort -u | grep -v README.sh4)
$ futurize -w -f lib2to3.fixes.fix_standarderror $py
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/qmp/qemu-ga-client | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/qmp/qemu-ga-client b/scripts/qmp/qemu-ga-client
index 6045fcd3f2..976e69e05f 100755
--- a/scripts/qmp/qemu-ga-client
+++ b/scripts/qmp/qemu-ga-client
@@ -137,7 +137,7 @@ class QemuGuestAgentClient:
def fsfreeze(self, cmd):
if cmd not in ['status', 'freeze', 'thaw']:
- raise StandardError('Invalid command: ' + cmd)
+ raise Exception('Invalid command: ' + cmd)
return getattr(self.qga, 'fsfreeze' + '_' + cmd)()
@@ -146,7 +146,7 @@ class QemuGuestAgentClient:
def suspend(self, mode):
if mode not in ['disk', 'ram', 'hybrid']:
- raise StandardError('Invalid mode: ' + mode)
+ raise Exception('Invalid mode: ' + mode)
try:
getattr(self.qga, 'suspend' + '_' + mode)()
@@ -157,7 +157,7 @@ class QemuGuestAgentClient:
def shutdown(self, mode='powerdown'):
if mode not in ['powerdown', 'halt', 'reboot']:
- raise StandardError('Invalid mode: ' + mode)
+ raise Exception('Invalid mode: ' + mode)
try:
self.qga.shutdown(mode=mode)
--
2.18.0.rc1.1.g3f1ff2140
next prev parent reply other threads:[~2018-06-08 12:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-08 12:29 [Qemu-devel] [PATCH v2 00/10] python: futurize --stage1 (Python 3 compatibility) Eduardo Habkost
2018-06-08 12:29 ` [Qemu-devel] [PATCH v2 01/10] python: futurize -f libfuturize.fixes.fix_print_with_import Eduardo Habkost
2018-06-08 13:37 ` [Qemu-devel] [PATCH] fixup! " Eduardo Habkost
2018-06-11 13:33 ` Stefan Hajnoczi
2018-06-08 12:29 ` [Qemu-devel] [PATCH v2 02/10] python: futurize -f libfuturize.fixes.fix_absolute_import Eduardo Habkost
2018-06-08 13:45 ` Stefan Hajnoczi
2018-06-08 12:29 ` [Qemu-devel] [PATCH v2 03/10] python: futurize -f libfuturize.fixes.fix_next_call Eduardo Habkost
2018-06-08 12:29 ` [Qemu-devel] [PATCH v2 04/10] python: futurize -f lib2to3.fixes.fix_has_key Eduardo Habkost
2018-06-08 12:29 ` Eduardo Habkost [this message]
2018-06-08 12:29 ` [Qemu-devel] [PATCH v2 06/10] python: futurize -f lib2to3.fixes.fix_reduce Eduardo Habkost
2018-06-08 12:29 ` [Qemu-devel] [PATCH v2 07/10] python: futurize -f lib2to3.fixes.fix_tuple_params Eduardo Habkost
2018-06-08 12:29 ` [Qemu-devel] [PATCH v2 08/10] python: futurize -f lib2to3.fixes.fix_renames Eduardo Habkost
2018-06-08 12:29 ` [Qemu-devel] [PATCH v2 09/10] python: futurize -f lib2to3.fixes.fix_except Eduardo Habkost
2018-06-08 12:29 ` [Qemu-devel] [PATCH v2 10/10] python: futurize -f lib2to3.fixes.fix_numliterals Eduardo Habkost
2018-06-08 12:48 ` [Qemu-devel] [PATCH v2 00/10] python: futurize --stage1 (Python 3 compatibility) no-reply
2018-06-08 13:01 ` no-reply
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=20180608122952.2009-6-ehabkost@redhat.com \
--to=ehabkost@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=crosa@redhat.com \
--cc=dgilbert@redhat.com \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=kwolf@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=stefanha@redhat.com \
/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).