[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 24/25] tests/qapi-schema: Use Python OSError instead of outmode
From: |
Markus Armbruster |
Subject: |
[PULL v2 24/25] tests/qapi-schema: Use Python OSError instead of outmoded IOError |
Date: |
Mon, 27 Sep 2021 15:06:46 +0200 |
https://docs.python.org/3.6/library/exceptions.html has
Changed in version 3.3: EnvironmentError, IOError, WindowsError,
socket.error, select.error and mmap.error have been merged into
OSError, and the constructor may return a subclass.
and
The following exceptions are kept for compatibility with previous
versions; starting from Python 3.3, they are aliases of OSError.
exception EnvironmentError
exception IOError
exception WindowsError
Only available on Windows.
Switch to the preferred name.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210922125619.670673-2-armbru@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
[Details added to commit message]
---
tests/qapi-schema/test-qapi.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/qapi-schema/test-qapi.py b/tests/qapi-schema/test-qapi.py
index 73cffae2b6..2e384f5efd 100755
--- a/tests/qapi-schema/test-qapi.py
+++ b/tests/qapi-schema/test-qapi.py
@@ -154,7 +154,7 @@ def test_and_diff(test_name, dir_name, update):
errfp = open(os.path.join(dir_name, test_name + '.err'), mode)
expected_out = outfp.readlines()
expected_err = errfp.readlines()
- except IOError as err:
+ except OSError as err:
print("%s: can't open '%s': %s"
% (sys.argv[0], err.filename, err.strerror),
file=sys.stderr)
@@ -180,7 +180,7 @@ def test_and_diff(test_name, dir_name, update):
errfp.truncate(0)
errfp.seek(0)
errfp.writelines(actual_err)
- except IOError as err:
+ except OSError as err:
print("%s: can't write '%s': %s"
% (sys.argv[0], err.filename, err.strerror),
file=sys.stderr)
--
2.31.1
- [PULL v2 25/25] tests/qapi-schema: Make test-qapi.py -u work when files are absent, (continued)
- [PULL v2 25/25] tests/qapi-schema: Make test-qapi.py -u work when files are absent, Markus Armbruster, 2021/09/27
- [PULL v2 18/25] test-clone-visitor: Wean off __org.qemu_x-Union1, Markus Armbruster, 2021/09/27
- [PULL v2 06/25] qapi: Convert simple union MemoryDeviceInfo to flat one, Markus Armbruster, 2021/09/27
- [PULL v2 23/25] test-clone-visitor: Correct an accidental rename, Markus Armbruster, 2021/09/27
- [PULL v2 15/25] tests/qapi-schema: Wean off UserDefListUnion, Markus Armbruster, 2021/09/27
- [PULL v2 12/25] test-qobject-input-visitor: Wean off UserDefListUnion, Markus Armbruster, 2021/09/27
- [PULL v2 21/25] qapi: Drop simple unions, Markus Armbruster, 2021/09/27
- [PULL v2 20/25] tests/qapi-schema: Purge simple unions from tests, Markus Armbruster, 2021/09/27
- [PULL v2 22/25] tests/qapi-schema: Rename flat-union-* test cases to union-*, Markus Armbruster, 2021/09/27
- [PULL v2 13/25] test-qobject-output-visitor: Wean off UserDefListUnion, Markus Armbruster, 2021/09/27
- [PULL v2 24/25] tests/qapi-schema: Use Python OSError instead of outmoded IOError,
Markus Armbruster <=
- [PULL v2 01/25] qapi: Tidy up unusual line breaks, Markus Armbruster, 2021/09/27
- Re: [PULL v2 00/25] QAPI patches patches for 2021-09-25, Peter Maydell, 2021/09/27