X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fhostmap.py;h=d73a6cea473ba7c0be59cdbc4ed22b8d96b789ee;hb=HEAD;hp=8bd1c089a7fdf0732b7a21ff25692539763a6b76;hpb=ffe49131a51c85e7bf8c4a6cb641a805beb09a50;p=nodemanager.git

diff --git a/plugins/hostmap.py b/plugins/hostmap.py
index 8bd1c08..d73a6ce 100644
--- a/plugins/hostmap.py
+++ b/plugins/hostmap.py
@@ -6,7 +6,7 @@ import logger
 import os
 import curlwrapper
 import re
-import xmlrpclib
+import xmlrpc.client
 try:
     from hashlib import sha1 as sha
 except ImportError:
@@ -30,7 +30,7 @@ SUFFIX = "# ----- End -----"
 def GetSlivers(data, config=None, plc=None):
 
     if 'slivers' not in data:
-        logger.log_missing_data("hostmap.GetSlivers",'slivers')
+        logger.log_missing_data("hostmap.GetSlivers", 'slivers')
         return
 
     if 'hostname' not in data:
@@ -48,7 +48,8 @@ def GetSlivers(data, config=None, plc=None):
                 if not os.path.exists(fn):
                     continue
 
-                contents = file(fn,"r").read()
+                with open(fn) as f:
+                    contents = f.read()
 
                 hostmap = []
                 for index, entry in enumerate(tag["value"].split("\n")):
@@ -84,7 +85,8 @@ def GetSlivers(data, config=None, plc=None):
                     contents = contents + hostmap
 
                 try:
-                    file(fn, "w").write(contents)
+                    with open(fn, "w") as f:
+                        f.write(contents)
                 except:
                     logger.log_exc("hostmap (%s): failed to write %s" % (slicename, fn))