hopefully fewer leaks in files : always use a context manager to open files

[nodemanager.git] / conf_files.py

diff --git a/conf_files.py b/conf_files.py
index 4801979..fcc3b7d 100644 (file)
--- a/conf_files.py
+++ b/conf_files.py
@@ -1,6 +1,3 @@
-# $Id$
-# $URL$
-
 """configuration files"""
 
 import grp
@@ -16,7 +13,7 @@ import curlwrapper
 import logger
 import tools
 import xmlrpclib
-from config import Config 
+from config import Config
 
 # right after net
 priority = 2
@@ -85,11 +82,11 @@ class conf_files:
             for f in data['conf_files']:
                 try: self.update_conf_file(f)
                 except: logger.log_exc("conf_files: failed to update conf_file")
-        else: 
+        else:
             logger.log_missing_data("conf_files.run_once",'conf_files')
 
 
-def start(options, config): pass
+def start(): pass
 
 def GetSlivers(data, config = None, plc = None):
     logger.log("conf_files: Running.")
@@ -110,7 +107,8 @@ if __name__ == '__main__':
 
     # Load /etc/planetlab/session
     if os.path.exists(options.session):
-        session = file(options.session).read().strip()
+        with open(options.session) as f:
+            session = f.read().strip()
     else:
         session = options.session