From 2f8140f93e6672705e378e4588b21657f3098034 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sat, 15 Jun 2013 22:02:50 +0100
Subject: [PATCH] mdwsetup.py: Use `with open(...) as f' instead of
 `try'/`finally'.

---
 mdwsetup.py | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/mdwsetup.py b/mdwsetup.py
index b423c2a..7b864c8 100644
--- a/mdwsetup.py
+++ b/mdwsetup.py
@@ -23,6 +23,8 @@
 ### along with `common'; if not, write to the Free Software Foundation,
 ### Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+from __future__ import with_statement
+
 import sys as SYS
 import os as OS
 import re as RE
@@ -143,16 +145,10 @@ def derive(target, source, substmap):
     return False
   print "making `%s' from `%s'" % (target, source)
   temp = target + '.new'
-  ft = open(temp, 'w')
-  try:
-    fs = open(source, 'r')
-    try:
+  with open(temp, 'w') as ft:
+    with open(source, 'r') as fs:
       for line in fs:
         ft.write(RX_SUBST.sub((lambda m: substmap[m.group(1)]), line))
-    finally:
-      fs.close()
-  finally:
-    ft.close()
   OS.rename(temp, target)
 
 def generate(target, source = None):
@@ -167,11 +163,8 @@ def generate(target, source = None):
     return
   print "making `%s' using `%s'" % (target, source)
   temp = target + '.new'
-  ft = open(temp, 'w')
-  try:
+  with open(temp, 'w') as ft:
     rc = SUB.call([SYS.executable, source], stdout = ft)
-  finally:
-    ft.close()
   if rc != 0:
     raise SubprocessFailure, (source, rc)
   OS.rename(temp, target)
@@ -188,11 +181,7 @@ def auto_version(writep = True):
   """
   version = progoutput(['./auto-version'])
   if writep:
-    ft = open('RELEASE.new', 'w')
-    try:
-      ft.write('%s\n' % version)
-    finally:
-      ft.close()
+    with open('RELEASE.new', 'w') as ft: ft.write('%s\n' % version)
     OS.rename('RELEASE.new', 'RELEASE')
   return version
 
-- 
2.11.0