X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=modprobe.py;fp=modprobe.py;h=f48fa8d8ad8d0b267188470fd826cb863cf330bb;hb=a73ccf160162932415e58e2bb9abcef3f34abcc3;hp=da1dcafbb28c1315bb63e43646409780e137f182;hpb=ff1b521a21ca7ef562629ae1b89d47f4aa859966;p=pyplnet.git

diff --git a/modprobe.py b/modprobe.py
index da1dcaf..f48fa8d 100644
--- a/modprobe.py
+++ b/modprobe.py
@@ -72,8 +72,8 @@ class Modprobe:
                 command = parts[0].lower()
 
                 # check if its a command we support
-                if not self.conffile.has_key(command):
-                    print "WARNING: command %s not recognized." % command
+                if command not in self.conffile:
+                    print("WARNING: command %s not recognized." % command)
                     continue
 
                 func = funcs.get(command,__default)
@@ -118,7 +118,7 @@ class Modprobe:
             fb.close()
 
             return buf_a == buf_b
-        except IOError, e:
+        except IOError as e:
             return False
 
     def output(self,filename="/etc/modprobe.conf",program="NodeManager"):
@@ -128,7 +128,7 @@ class Modprobe:
 
         for command in ("alias","options","install","remove","blacklist"):
             table = self.conffile[command]
-            keys = table.keys()
+            keys = list(table.keys())
             keys.sort()
             for k in keys:
                 v = table[k]
@@ -137,7 +137,7 @@ class Modprobe:
         fb.close()
         if not self._comparefiles(tmpnam,filename):
             os.rename(tmpnam,filename)
-            os.chmod(filename,0644)
+            os.chmod(filename,0o644)
             return True
         else:
             os.unlink(tmpnam)