Re: [Qemu-devel] [PATCH v2] iotests: handle TypeError for Python3 in test 242

[Andrey Shinkevich]

On 22/02/2019 18:20, Cleber Rosa wrote:
> 
> 
> On 2/22/19 6:26 AM, Andrey Shinkevich wrote:
>> The data type for bytes in Python3 differs from the one in Python2.
>> Those cases should be managed separately.
>>
>> v1:
>> In the first version, the TypeError in Python3 was handled as the
>> exception.
>> Discussed in the e-mail thread with the Message ID:
>> <address@hidden>
>>
>> Signed-off-by: Andrey Shinkevich <address@hidden>
>> Reported-by: Kevin Wolf <address@hidden>
>> ---
>>   tests/qemu-iotests/242 | 8 ++++++--
>>   1 file changed, 6 insertions(+), 2 deletions(-)
>>
>> diff --git a/tests/qemu-iotests/242 b/tests/qemu-iotests/242
>> index 16c65ed..446fbf8 100755
>> --- a/tests/qemu-iotests/242
>> +++ b/tests/qemu-iotests/242
>> @@ -20,6 +20,7 @@
>>   
>>   import iotests
>>   import json
>> +import sys
>>   from iotests import qemu_img_create, qemu_io, qemu_img_pipe, \
>>       file_path, img_info_log, log, filter_qemu_io
>>   
>> @@ -65,9 +66,12 @@ 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)
>> +        toggled = ord(c) ^ bitmap_flag_unknown
>>           f.seek(-1, 1)
>> -        f.write(toggled)
>> +        if sys.version_info.major >= 3:
>> +            f.write(bytes([toggled]))
>> +        else:
>> +            f.write(chr(toggled))
>>   
> 
> I originally suggested:
> 
> sys.version_info.major == 2:
>   ...
> 
> Because this is already present on other tests, and IIRC Max mentioned
> using this as an easy to find flag the moment Python 2 support is to be
> dropped.  But, looking for "sys.version_info.major" is just as
> effective, so:
> 
> Reviewed-by: Cleber Rosa <address@hidden>
> 

Thank you very much, Cleber. Your review is helpful.

>>   
>>   qemu_img_create('-f', iotests.imgfmt, disk, '1M')
>>

-- 
With the best regards,
Andrey Shinkevich