[bitbake-devel] [PATCH 4/4] siggen: properly close files rather than opening them inline

[Peter Kjellerstedt]

> -----Original Message-----
> From: bitbake-devel-bounces at lists.openembedded.org [mailto:bitbake-
> devel-bounces at lists.openembedded.org] On Behalf Of Paul Eggleton
> Sent: den 11 augusti 2016 05:37
> To: bitbake-devel at lists.openembedded.org
> Subject: [bitbake-devel] [PATCH 4/4] siggen: properly close files
> rather than opening them inline
> 
> If you don't do this, with Python 3 you get a warning on exit under some
> circumstances.
> 
> Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
> ---
>  lib/bb/siggen.py | 15 +++++++++------
>  1 file changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
> index 5d8a253..9b2f658 100644
> --- a/lib/bb/siggen.py
> +++ b/lib/bb/siggen.py
> @@ -363,10 +363,12 @@ def clean_basepaths_list(a):
>  def compare_sigfiles(a, b, recursecb = None):
>      output = []
> 
> -    p1 = pickle.Unpickler(open(a, "rb"))
> -    a_data = p1.load()
> -    p2 = pickle.Unpickler(open(b, "rb"))
> -    b_data = p2.load()
> +    with open(a, 'rb') as f:
> +        p1 = pickle.Unpickler(ff)
                                 ^^
Shouldn't that be:

        p1 = pickle.Unpickler(f)

> +        a_data = p1.load()
> +    with open(b, 'rb') as f:
> +        p2 = pickle.Unpickler(f)
> +        b_data = p2.load()
> 
>      def dict_diff(a, b, whitelist=set()):
>          sa = set(a.keys())
> @@ -563,8 +565,9 @@ def calc_taskhash(sigdata):
>  def dump_sigfile(a):
>      output = []
> 
> -    p1 = pickle.Unpickler(open(a, "rb"))
> -    a_data = p1.load()
> +    with open(a, 'rb') as f:
> +        p1 = pickle.Unpickler(f)
> +        a_data = p1.load()
> 
>      output.append("basewhitelist: %s" % (a_data['basewhitelist']))
> 
> --
> 2.5.5

//Peter