[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/25] tests/qapi-schema: Use Python OSError instead of outmoded I
From: |
Markus Armbruster |
Subject: |
[PULL 24/25] tests/qapi-schema: Use Python OSError instead of outmoded IOError |
Date: |
Sat, 25 Sep 2021 08:25:24 +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 04/25] qapi: Convert simple union InputEvent to flat one, (continued)
- [PULL 04/25] qapi: Convert simple union InputEvent to flat one, Markus Armbruster, 2021/09/25
- [PULL 10/25] qapi: Convert simple union TransactionAction to flat one, Markus Armbruster, 2021/09/25
- [PULL 06/25] qapi: Convert simple union MemoryDeviceInfo to flat one, Markus Armbruster, 2021/09/25
- [PULL 11/25] tests/qapi-schema: Prepare for simple union UserDefListUnion removal, Markus Armbruster, 2021/09/25
- [PULL 05/25] qapi: Convert simple union TpmTypeOptions to flat one, Markus Armbruster, 2021/09/25
- [PULL 16/25] tests/qapi-schema: Simple union UserDefListUnion is now unused, drop, Markus Armbruster, 2021/09/25
- [PULL 12/25] test-qobject-input-visitor: Wean off UserDefListUnion, Markus Armbruster, 2021/09/25
- [PULL 20/25] tests/qapi-schema: Purge simple unions from tests, Markus Armbruster, 2021/09/25
- [PULL 02/25] qapi: Stop enforcing "type name should not end in 'Kind', Markus Armbruster, 2021/09/25
- [PULL 14/25] test-clone-visitor: Wean off UserDefListUnion, Markus Armbruster, 2021/09/25
- [PULL 24/25] tests/qapi-schema: Use Python OSError instead of outmoded IOError,
Markus Armbruster <=
- [PULL 13/25] test-qobject-output-visitor: Wean off UserDefListUnion, Markus Armbruster, 2021/09/25
- [PULL 23/25] test-clone-visitor: Correct an accidental rename, Markus Armbruster, 2021/09/25
- [PULL 22/25] tests/qapi-schema: Rename flat-union-* test cases to union-*, Markus Armbruster, 2021/09/25
- [PULL 21/25] qapi: Drop simple unions, Markus Armbruster, 2021/09/25
- [PULL 17/25] tests/qapi-schema: Rewrite simple union TestIfUnion to be flat, Markus Armbruster, 2021/09/25
- [PULL 09/25] qapi: Convert simple union ImageInfoSpecific to flat one, Markus Armbruster, 2021/09/25
- [PULL 01/25] qapi: Tidy up unusual line breaks, Markus Armbruster, 2021/09/25
- [PULL 07/25] qapi: Convert simple union ChardevBackend to flat one, Markus Armbruster, 2021/09/25
- [PULL 08/25] qapi: Convert simple union SocketAddressLegacy to flat one, Markus Armbruster, 2021/09/25
- [PULL 15/25] tests/qapi-schema: Wean off UserDefListUnion, Markus Armbruster, 2021/09/25