[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/13] python: futurize -f lib2to3.fixes.fix_standard
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PULL 05/13] python: futurize -f lib2to3.fixes.fix_standarderror |
Date: |
Mon, 11 Jun 2018 14:42:35 -0300 |
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 <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
---
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
- [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11, Eduardo Habkost, 2018/06/11
- [Qemu-devel] [PULL 02/13] python: futurize -f libfuturize.fixes.fix_absolute_import, Eduardo Habkost, 2018/06/11
- [Qemu-devel] [PULL 03/13] python: futurize -f libfuturize.fixes.fix_next_call, Eduardo Habkost, 2018/06/11
- [Qemu-devel] [PULL 04/13] python: futurize -f lib2to3.fixes.fix_has_key, Eduardo Habkost, 2018/06/11
- [Qemu-devel] [PULL 06/13] python: futurize -f lib2to3.fixes.fix_reduce, Eduardo Habkost, 2018/06/11
- [Qemu-devel] [PULL 01/13] python: futurize -f libfuturize.fixes.fix_print_with_import, Eduardo Habkost, 2018/06/11
- [Qemu-devel] [PULL 05/13] python: futurize -f lib2to3.fixes.fix_standarderror,
Eduardo Habkost <=
- [Qemu-devel] [PULL 07/13] python: futurize -f lib2to3.fixes.fix_tuple_params, Eduardo Habkost, 2018/06/11
- [Qemu-devel] [PULL 08/13] python: futurize -f lib2to3.fixes.fix_renames, Eduardo Habkost, 2018/06/11
- [Qemu-devel] [PULL 09/13] python: futurize -f lib2to3.fixes.fix_except, Eduardo Habkost, 2018/06/11
- [Qemu-devel] [PULL 11/13] configure: Require Python 2.7 or newer, Eduardo Habkost, 2018/06/11
- [Qemu-devel] [PULL 10/13] python: futurize -f lib2to3.fixes.fix_numliterals, Eduardo Habkost, 2018/06/11
- [Qemu-devel] [PULL 13/13] python: Remove scripts/ordereddict.py, Eduardo Habkost, 2018/06/11
- [Qemu-devel] [PULL 12/13] python: Remove scripts/argparse.py, Eduardo Habkost, 2018/06/11
- Re: [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11, no-reply, 2018/06/11
- Re: [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11, Peter Maydell, 2018/06/12
- Re: [Qemu-devel] [PULL 00/13] Python queue, 2018-06-11, Peter Maydell, 2018/06/19