qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH 1/2] tests/qapi-schema: Use Python OSError instead of outmode


From: Philippe Mathieu-Daudé
Subject: Re: [PATCH 1/2] tests/qapi-schema: Use Python OSError instead of outmoded IOError
Date: Thu, 23 Sep 2021 11:54:39 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0

On 9/23/21 11:33, Markus Armbruster wrote:
John Snow <jsnow@redhat.com> writes:

On Wed, Sep 22, 2021 at 8:56 AM Markus Armbruster <armbru@redhat.com> wrote:

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
  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


If you're happy with the expanded scope of the exception-catcher, I am too.

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.

With that information amended to the description:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

So unless I'm misunderstanding something (which is quite possible),
we're catching exactly the same exceptions as before, we just switch to
their preferred name.

Reviewed-by: John Snow <jsnow@redhat.com>

Thanks!






reply via email to

[Prev in Thread] Current Thread [Next in Thread]