[Mesa-dev] [PATCH 06/11] glapi: Fix whitespace droppings when printing the license header

Ian Romanick idr at freedesktop.org
Mon Mar 28 18:03:58 UTC 2016


On 03/25/2016 05:33 PM, Dylan Baker wrote:
> Quoting Dylan Baker (2016-03-25 16:01:00)
>> Quoting Adam Jackson (2016-03-24 11:10:01)
>>> Signed-off-by: Adam Jackson <ajax at redhat.com>
>>> ---
>>>  src/mapi/glapi/gen/gl_XML.py | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/src/mapi/glapi/gen/gl_XML.py b/src/mapi/glapi/gen/gl_XML.py
>>> index 2e7123e..e11f6fc 100644
>>> --- a/src/mapi/glapi/gen/gl_XML.py
>>> +++ b/src/mapi/glapi/gen/gl_XML.py
>>> @@ -130,7 +130,7 @@ class gl_print_base(object):
>>>                  % (self.name)
>>>          print ''
>>>          print '/*'
>>> -        print ' * ' + self.license.replace('\n', '\n * ')
>>> +        print (' * ' + self.license.replace('\n', '\n * ')).replace(' \n', '\n')
>>
>> That's a brainful to parse, what about to stupid, but obvious solution:
>>
>> for l in self.license.split('\n'):
>>     print ' * {0}'.format(l)
> 
> Or, since mesa's python code seems to use C style formatters:
> print ' * %s' % l

Do those actually do the right thing?  self.license is multiple lines of
text.  The old code prefixes each line after the first line with ' * '.

I'm not sure how the dangling whitespace occurs in the first place.  Is
it in the original license text?  Could we just trim it there?

>>>          print ' */'
>>>          print ''
>>>          if self.header_tag:
>>> -- 
>>> 2.5.0
>>>
>>> _______________________________________________
>>> mesa-dev mailing list
>>> mesa-dev at lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160328/9412af60/attachment.sig>


More information about the mesa-dev mailing list