New upstream version 3.1.0upstream/3.1.0

1 files changed, 8 insertions, 10 deletions

diff --git a/site_scons/soe_utils.py b/site_scons/soe_utils.py
index 451c7de..3b87dee 100644
--- a/site_scons/soe_utils.py
+++ b/site_scons/soe_utils.py
@@ -17,16 +17,14 @@ def soelim(target, source, env):
     t = str(target[0])
     s = str(source[0])
     dir, f = os.path.split(s)
-    tfp = open(t, 'w')
-    sfp = open(s, 'r')
-    for line in sfp.readlines():
-        if line[:4] in ['.so ', "'so "]:
-            sofile = os.path.join(dir, line[4:-1])
-            tfp.write(open(sofile, 'r').read())
-        else:
-            tfp.write(line)
-    sfp.close()
-    tfp.close()
+    with open(t, 'w') as tfp, open(s, 'r') as sfp:
+        for line in sfp.readlines():
+            if line[:4] in ['.so ', "'so "]:
+                sofile = os.path.join(dir, line[4:-1])
+                with open(sofile, 'r') as f:
+                    tfp.write(f.read())
+            else:
+                tfp.write(line)
 
 def soscan(node, env, path):
     c = node.get_text_contents()