All of lore.kernel.org
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "John Snow" <jsnow@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL v2 24/25] tests/qapi-schema: Use Python OSError instead of outmoded IOError
Date: Mon, 27 Sep 2021 15:06:46 +0200	[thread overview]
Message-ID: <20210927130647.1271533-25-armbru@redhat.com> (raw)
In-Reply-To: <20210927130647.1271533-1-armbru@redhat.com>

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



  parent reply	other threads:[~2021-09-27 13:28 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-27 13:06 [PULL v2 00/25] QAPI patches patches for 2021-09-25 Markus Armbruster
2021-09-27 13:06 ` [PULL v2 01/25] qapi: Tidy up unusual line breaks Markus Armbruster
2021-09-27 13:06 ` [PULL v2 02/25] qapi: Stop enforcing "type name should not end in 'Kind' Markus Armbruster
2021-09-27 13:06 ` [PULL v2 03/25] qapi: Convert simple union KeyValue to flat one Markus Armbruster
2021-09-27 13:06 ` [PULL v2 04/25] qapi: Convert simple union InputEvent " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 05/25] qapi: Convert simple union TpmTypeOptions " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 06/25] qapi: Convert simple union MemoryDeviceInfo " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 07/25] qapi: Convert simple union ChardevBackend " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 08/25] qapi: Convert simple union SocketAddressLegacy " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 09/25] qapi: Convert simple union ImageInfoSpecific " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 10/25] qapi: Convert simple union TransactionAction " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 11/25] tests/qapi-schema: Prepare for simple union UserDefListUnion removal Markus Armbruster
2021-09-27 13:06 ` [PULL v2 12/25] test-qobject-input-visitor: Wean off UserDefListUnion Markus Armbruster
2021-09-27 13:06 ` [PULL v2 13/25] test-qobject-output-visitor: " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 14/25] test-clone-visitor: " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 15/25] tests/qapi-schema: " Markus Armbruster
2021-09-27 13:06 ` [PULL v2 16/25] tests/qapi-schema: Simple union UserDefListUnion is now unused, drop Markus Armbruster
2021-09-27 13:06 ` [PULL v2 17/25] tests/qapi-schema: Rewrite simple union TestIfUnion to be flat Markus Armbruster
2021-09-27 13:06 ` [PULL v2 18/25] test-clone-visitor: Wean off __org.qemu_x-Union1 Markus Armbruster
2021-09-27 13:06 ` [PULL v2 19/25] tests/qapi-schema: Drop simple union __org.qemu_x-Union1 Markus Armbruster
2021-09-27 13:06 ` [PULL v2 20/25] tests/qapi-schema: Purge simple unions from tests Markus Armbruster
2021-09-27 13:06 ` [PULL v2 21/25] qapi: Drop simple unions Markus Armbruster
2021-09-27 13:06 ` [PULL v2 22/25] tests/qapi-schema: Rename flat-union-* test cases to union-* Markus Armbruster
2021-09-27 13:06 ` [PULL v2 23/25] test-clone-visitor: Correct an accidental rename Markus Armbruster
2021-09-27 13:06 ` Markus Armbruster [this message]
2021-09-27 13:06 ` [PULL v2 25/25] tests/qapi-schema: Make test-qapi.py -u work when files are absent Markus Armbruster
2021-09-27 15:47 ` [PULL v2 00/25] QAPI patches patches for 2021-09-25 Peter Maydell

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=20210927130647.1271533-25-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.