Re: [PATCH] gdb: copyright: make file header scan a bit more pythonic

[Joel Brobecker <brobecker@adacore.com>]

Hi Mike,

On Mon, Oct 24, 2022 at 01:07:17AM +0545, Mike Frysinger via Gdb-patches wrote:
> ping ...
> -mike
> 
> On 01 Jan 2022 13:15, Mike Frysinger via Gdb-patches wrote:
> > Should be functionally the same, but uses more pythonic idioms to get
> > fewer lines of code, and to make sure to not leak open file handles.

Sorry about the delay in reviewing. The patch is approved and you can
push it.

Thanks for the patch.

> > ---
> >  gdb/copyright.py | 15 ++++++---------
> >  1 file changed, 6 insertions(+), 9 deletions(-)
> > 
> > diff --git a/gdb/copyright.py b/gdb/copyright.py
> > index a78f7f2aa9b0..918d2e473d49 100755
> > --- a/gdb/copyright.py
> > +++ b/gdb/copyright.py
> > @@ -148,15 +148,12 @@ def may_have_copyright_notice(filename):
> >      # so just open the file as a byte stream. We only need to search
> >      # for a pattern that should be the same regardless of encoding,
> >      # so that should be good enough.
> > -    fd = open(filename, "rb")
> > -
> > -    lineno = 1
> > -    for line in fd:
> > -        if b"Copyright" in line:
> > -            return True
> > -        lineno += 1
> > -        if lineno > 50:
> > -            return False
> > +    with open(filename, "rb") as fd:
> > +        for lineno, line in enumerate(fd, start=1):
> > +            if b"Copyright" in line:
> > +                return True
> > +            if lineno > 50:
> > +                break
> >      return False
> >  
> >  
> > -- 
> > 2.33.0
> > 



-- 
Joel