reguire gnupg1 on f>=31; sense the system to use gpg1 when installed

[nodemanager.git] / net.py

diff --git a/net.py b/net.py
index 23a13b6..7756d6b 100644 (file)
--- a/net.py
+++ b/net.py
@@ -1,17 +1,21 @@
-"""network configuration"""
+"""
+network configuration
+"""
 
 # system provided modules
-import os, string, time, socket
+import os
 
 # PlanetLab system modules
 import sioc, plnet
 
 # local modules
 import plnode.bwlimit as bwlimit
-import logger, iptables, tools
+import logger
+import iptables
+import tools
 
 # we can't do anything without a network
-priority=1
+priority = 1
 
 dev_default = tools.get_default_if()
 
@@ -59,7 +63,7 @@ def InitNodeLimit(data):
 
     # query running network interfaces
     devs = sioc.gifconf()
-    ips = dict(zip(devs.values(), devs.keys()))
+    ips = dict(list(zip(list(devs.values()), list(devs.keys()))))
     macs = {}
     for dev in devs:
         macs[sioc.gifhwaddr(dev).lower()] = dev
@@ -68,7 +72,7 @@ def InitNodeLimit(data):
         # Get interface name preferably from MAC address, falling
         # back on IP address.
         hwaddr=interface['mac']
-        if hwaddr <> None: hwaddr=hwaddr.lower()
+        if hwaddr != None: hwaddr=hwaddr.lower()
         if hwaddr in macs:
             dev = macs[interface['mac']]
         elif interface['ip'] in ips:
@@ -126,7 +130,7 @@ def InitNAT(plc, data):
 
     # query running network interfaces
     devs = sioc.gifconf()
-    ips = dict(zip(devs.values(), devs.keys()))
+    ips = dict(list(zip(list(devs.values()), list(devs.keys()))))
     macs = {}
     for dev in devs:
         macs[sioc.gifhwaddr(dev).lower()] = dev
@@ -136,7 +140,7 @@ def InitNAT(plc, data):
         # Get interface name preferably from MAC address, falling
         # back on IP address.
         hwaddr=interface['mac']
-        if hwaddr <> None: hwaddr=hwaddr.lower()
+        if hwaddr != None: hwaddr=hwaddr.lower()
         if hwaddr in macs:
             dev = macs[interface['mac']]
         elif interface['ip'] in ips: