Re: [Buildroot] [PATCH] utils/check-package: drop six usage

["Yann E. MORIN" <yann.morin.1998@free.fr>]

On 2023-04-02 20:35 -0500, Vincent Fazio spake thusly:
> The shebang in check-package now defines python3. There is no longer a
> need to maintain support with python 2.x.
> 
> See-also: 02b165dc71 (check-package: fix Python3 support)
> 
> Signed-off-by: Vincent Fazio <vfazio@gmail.com>
> ---
>  utils/check-package | 10 +++-------
>  1 file changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/utils/check-package b/utils/check-package
> index 98a25bd0b2..46f2897b51 100755
> --- a/utils/check-package
> +++ b/utils/check-package
> @@ -6,7 +6,6 @@ import inspect
>  import magic
>  import os
>  import re
> -import six
>  import sys
>  
>  import checkpackagelib.base
> @@ -218,12 +217,9 @@ def check_file_using_lib(fname):
>          if fail > 0:
>              failed.add(name)
>          nwarnings += warn
> -    if six.PY3:
> -        f = open(fname, "r", errors="surrogateescape")
> -    else:
> -        f = open(fname, "r")
> +
>      lastline = ""
> -    for lineno, text in enumerate(f.readlines()):
> +    for lineno, text in enumerate(open(fname, "r", errors="surrogateescape").readlines()):

Err.. This leaks a file object, no?

Even if the script is short-lived, it is better to properly close()
files once they are unused.

Here, I believe using a context manager is adequate (and relatively easy
now that we do no longer have to deal with two ways if opening the
file):

    with open(fname, "r", errors="surrogateescape") as f:
        for lineno, text in enumerate(f.readlines()):
            ...

Regards,
Yann E. MORIN.

>          nlines += 1
>          for name, cf in objects:
>              if cf.disable.search(lastline):
> @@ -233,7 +229,7 @@ def check_file_using_lib(fname):
>                  failed.add(name)
>              nwarnings += warn
>          lastline = text
> -    f.close()
> +
>      for name, cf in objects:
>          warn, fail = print_warnings(cf.after(), name in xfail)
>          if fail > 0:
> -- 
> 2.25.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot