]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[2298_7] use with-statement instead of try-except-finally statement
authorNaoki Kambe <kambe@jprs.co.jp>
Tue, 6 Nov 2012 12:01:31 +0000 (21:01 +0900)
committerNaoki Kambe <kambe@jprs.co.jp>
Tue, 6 Nov 2012 12:40:16 +0000 (21:40 +0900)
src/bin/stats/stats_httpd.py.in

index fd69d8b676d5efb538ad2154f9f4f04683e6d88d..e76bcbe0de8d17fb2628f0d8d85d35923ed2883f 100644 (file)
@@ -568,15 +568,12 @@ class StatsHttpd:
         string variable and returns string. Template object includes
         the variable. Limitation of a file size isn't needed there. XXXX"""
         lines = None
-        f = None
         try:
-            f = open(file_name, 'r')
-            lines = "".join(f.readlines())
+            with open(file_name, 'r') as f:
+                lines = "".join(f.readlines())
         except IOError as err:
             raise StatsHttpdDataError(
                 "%s: %s" % (err.__class__.__name__, err))
-        finally:
-            if f: f.close()
         return string.Template(lines)
 
 if __name__ == "__main__":