[Libreoffice-commits] core.git: solenv/gbuild

[Mike Kaganski]

 solenv/gbuild/gen-autoinstall.py |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 806dfdafa803d643937bc6edcd1aaebeddfeb7ac
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Thu Sep 22 12:11:37 2016 +0300

    Use 'with open(file) as f:' to avoid 'ResourceWarning: unclosed file'
    
    Removes 220 warnings from build log (at least under Windows).
    Requires Python 2.5+
    
    Change-Id: I06b18b14a08f2c27528fcb009faddff081ffd54e
    Reviewed-on: https://gerrit.libreoffice.org/29172
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/solenv/gbuild/gen-autoinstall.py b/solenv/gbuild/gen-autoinstall.py
index 6c0e4ad..61ed81a 100644
--- a/solenv/gbuild/gen-autoinstall.py
+++ b/solenv/gbuild/gen-autoinstall.py
@@ -18,11 +18,17 @@ scp2componentcondition = sys.argv[2]
 scp2libtemplate = sys.argv[3]
 scp2exetemplate = sys.argv[4]
 scp2jartemplate = sys.argv[5]
-sdklibs = open(sys.argv[6]).readline().split()
-libs = open(sys.argv[7]).readline().split()
-exes = open(sys.argv[8]).readline().split()
-jars = open(sys.argv[9]).readline().split()
-pkgs = open(sys.argv[10]).readline().split()
+# use 'with open(file) as f:' to avoid 'ResourceWarning: unclosed file'
+with open(sys.argv[6]) as f:
+    sdklibs = f.readline().split()
+with open(sys.argv[7]) as f:
+    libs = f.readline().split()
+with open(sys.argv[8]) as f:
+    exes = f.readline().split()
+with open(sys.argv[9]) as f:
+    jars = f.readline().split()
+with open(sys.argv[10]) as f:
+    pkgs = f.readline().split()
 
 if len(scp2componentcondition) > 0:
     scp2componentcondition = "," + scp2componentcondition