Sorry about the missed 'Signed-off-by: Nir Soffer <[email protected]>' The patch has been resent.
On 26/02/2019 18:53, Andrey Shinkevich wrote: > The data type for bytes in Python 3 differs from the one in Python 2. > The type cast that is compatible with both versions was applied. > > Signed-off-by: Andrey Shinkevich <[email protected]> > Reported-by: Kevin Wolf <[email protected]> > --- > v2: > The TypeError in Python3 was handled based on the version check. > Discussed in the e-mail thread with the Message ID: > <1550834773-873512-1-git-send-email-andrey.shinkev...@virtuozzo.com> > > v1: > The TypeError in Python3 was handled as the exception. > Discussed in the e-mail thread with the Message ID: > <1550519997-253534-1-git-send-email-andrey.shinkev...@virtuozzo.com> > > tests/qemu-iotests/242 | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/tests/qemu-iotests/242 b/tests/qemu-iotests/242 > index 16c65ed..c176e92 100755 > --- a/tests/qemu-iotests/242 > +++ b/tests/qemu-iotests/242 > @@ -20,6 +20,7 @@ > > import iotests > import json > +import struct > from iotests import qemu_img_create, qemu_io, qemu_img_pipe, \ > file_path, img_info_log, log, filter_qemu_io > > @@ -64,10 +65,11 @@ def write_to_disk(offset, size): > def toggle_flag(offset): > with open(disk, "r+b") as f: > f.seek(offset, 0) > - c = f.read(1) > - toggled = chr(ord(c) ^ bitmap_flag_unknown) > + # Read one byte in a way compatible with Python 2 > + flags = struct.unpack("B", f.read(1)) > + toggled = flags[0] ^ bitmap_flag_unknown > f.seek(-1, 1) > - f.write(toggled) > + f.write(struct.pack("B", toggled)) > > > qemu_img_create('-f', iotests.imgfmt, disk, '1M') > -- With the best regards, Andrey Shinkevich
