[ovs-dev] [PATCH] checkpatch: Use default encoding from email library.

Joe Stringer joe at ovn.org
Thu Jul 6 12:47:16 UTC 2017


On 5 July 2017 at 17:26, Ben Pfaff <blp at ovn.org> wrote:
> On Tue, Jul 04, 2017 at 07:16:46AM -0700, Joe Stringer wrote:
>> There are three paths for running the core checkpatch path: From a file,
>> from stdin, or reading from git output. Currently, the file version of
>> this calls the "email" library's decode routine which translates the
>> stream into a bytes array, which we later call decode() to turn it back
>> into a regular string. This works on python2 and python3, but the other
>> paths don't work in python3 due to the following error:
>>
>> $ utilities/checkpatch.py -1
>> == Checking HEAD~0 ==
>> Traceback (most recent call last):
>>   File "utilities/checkpatch.py", line 491, in <module>
>>     if ovs_checkpatch_parse(patch, revision):
>>   File "utilities/checkpatch.py", line 324, in ovs_checkpatch_parse
>>     for line in text.decode().split('\n'):
>> AttributeError: 'str' object has no attribute 'decode'
>>
>> Rather than performing this extra encode/decode, strip these out from
>> this path so that the stdin and git variants of checkpatch can work in
>> python3.
>>
>> Signed-off-by: Joe Stringer <joe at ovn.org>
>
> I didn't test this but it sounds reasonable to me.
>
> Acked-by: Ben Pfaff <blp at ovn.org>

Thanks, applied.


More information about the dev mailing list