| Message ID | 20191021214117.18091-1-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | image-fuzzer: Use OSerror.strerror instead of tuple subscript | expand |
On 10/21/19 5:41 PM, Eduardo Habkost wrote: > OSError can't be used like a tuple on Python 3, so change the > code to use `e.sterror` instead of `e[1]`. > > Reported-by: John Snow <jsnow@redhat.com> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: John Snow <jsnow@redhat.com> > --- > tests/image-fuzzer/runner.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/image-fuzzer/runner.py b/tests/image-fuzzer/runner.py > index 95d84f38f3..1eb2138f94 100755 > --- a/tests/image-fuzzer/runner.py > +++ b/tests/image-fuzzer/runner.py > @@ -159,7 +159,7 @@ class TestEnv(object): > os.makedirs(self.current_dir) > except OSError as e: > print("Error: The working directory '%s' cannot be used. Reason: %s"\ > - % (self.work_dir, e[1]), file=sys.stderr) > + % (self.work_dir, e.strerror), file=sys.stderr) > raise TestException > self.log = open(os.path.join(self.current_dir, "test.log"), "w") > self.parent_log = open(run_log, "a") > @@ -246,7 +246,7 @@ class TestEnv(object): > except OSError as e: > multilog("%sError: Start of '%s' failed. Reason: %s\n\n" > % (test_summary, os.path.basename(current_cmd[0]), > - e[1]), > + e.strerror), > sys.stderr, self.log, self.parent_log) > raise TestException > >
On Mon, Oct 21, 2019 at 06:41:17PM -0300, Eduardo Habkost wrote: > OSError can't be used like a tuple on Python 3, so change the > code to use `e.sterror` instead of `e[1]`. > > Reported-by: John Snow <jsnow@redhat.com> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > tests/image-fuzzer/runner.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Thanks, applied to my block tree: https://github.com/stefanha/qemu/commits/block Stefan
diff --git a/tests/image-fuzzer/runner.py b/tests/image-fuzzer/runner.py index 95d84f38f3..1eb2138f94 100755 --- a/tests/image-fuzzer/runner.py +++ b/tests/image-fuzzer/runner.py @@ -159,7 +159,7 @@ class TestEnv(object): os.makedirs(self.current_dir) except OSError as e: print("Error: The working directory '%s' cannot be used. Reason: %s"\ - % (self.work_dir, e[1]), file=sys.stderr) + % (self.work_dir, e.strerror), file=sys.stderr) raise TestException self.log = open(os.path.join(self.current_dir, "test.log"), "w") self.parent_log = open(run_log, "a") @@ -246,7 +246,7 @@ class TestEnv(object): except OSError as e: multilog("%sError: Start of '%s' failed. Reason: %s\n\n" % (test_summary, os.path.basename(current_cmd[0]), - e[1]), + e.strerror), sys.stderr, self.log, self.parent_log) raise TestException
OSError can't be used like a tuple on Python 3, so change the code to use `e.sterror` instead of `e[1]`. Reported-by: John Snow <jsnow@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- tests/image-fuzzer/runner.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)