| Message ID | 20191016192430.25098-2-ehabkost@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | image-fuzzer: Port to Python 3 | expand |
On 10/16/19 9:24 PM, Eduardo Habkost wrote: > This probably never caused problems because on Linux there's no > actual newline conversion happening, but on Python 3 the > binary/text distinction is stronger and we must explicitly open > the image file in binary mode. > > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> > --- > tests/image-fuzzer/qcow2/layout.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/image-fuzzer/qcow2/layout.py b/tests/image-fuzzer/qcow2/layout.py > index 675877da96..c57418fa15 100644 > --- a/tests/image-fuzzer/qcow2/layout.py > +++ b/tests/image-fuzzer/qcow2/layout.py > @@ -503,7 +503,7 @@ class Image(object): > > def write(self, filename): > """Write an entire image to the file.""" > - image_file = open(filename, 'w') > + image_file = open(filename, 'wb') > for field in self: > image_file.seek(field.offset) > image_file.write(struct.pack(field.fmt, field.value)) > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/tests/image-fuzzer/qcow2/layout.py b/tests/image-fuzzer/qcow2/layout.py index 675877da96..c57418fa15 100644 --- a/tests/image-fuzzer/qcow2/layout.py +++ b/tests/image-fuzzer/qcow2/layout.py @@ -503,7 +503,7 @@ class Image(object): def write(self, filename): """Write an entire image to the file.""" - image_file = open(filename, 'w') + image_file = open(filename, 'wb') for field in self: image_file.seek(field.offset) image_file.write(struct.pack(field.fmt, field.value))
This probably never caused problems because on Linux there's no actual newline conversion happening, but on Python 3 the binary/text distinction is stronger and we must explicitly open the image file in binary mode. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> --- tests/image-fuzzer/qcow2/layout.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)