Fix pylint warnings and errors

This fixes several warnings and errors as reported by pylint.

1 files changed, 19 insertions, 21 deletions

diff --git a/rumba/model.py b/rumba/model.py
index 0659cb1..c8c00ab 100644
--- a/rumba/model.py
+++ b/rumba/model.py
@@ -44,7 +44,7 @@ class Testbed:
 # @name [string] DIF name
 #
 class DIF:
-    def __init__(self, name, members = None):
+    def __init__(self, name, members=None):
         self.name = name
         if members is None:
             members = list()
@@ -62,7 +62,7 @@ class DIF:
         return other != None and self.name == other.name
 
     def __neq__(self, other):
-        return not (self == other)
+        return not self == other
 
     def add_member(self, node):
         self.members.append(node)
@@ -76,7 +76,7 @@ class DIF:
 # Shim over UDP
 #
 class ShimUDPDIF(DIF):
-    def __init__(self, name, members = None):
+    def __init__(self, name, members=None):
         DIF.__init__(self, name, members)
 
     def get_ipcp_class(self):
@@ -87,7 +87,7 @@ class ShimUDPDIF(DIF):
 # @link_speed [int] Speed of the Ethernet network, in Mbps
 #
 class ShimEthDIF(DIF):
-    def __init__(self, name, members = None, link_speed = 0):
+    def __init__(self, name, members=None, link_speed=0):
         DIF.__init__(self, name, members)
         self.link_speed = int(link_speed)
         if self.link_speed < 0:
@@ -101,7 +101,7 @@ class ShimEthDIF(DIF):
 # @policies [dict] Policies of the normal DIF
 #
 class NormalDIF(DIF):
-    def __init__(self, name, members = None, policies = None):
+    def __init__(self, name, members=None, policies=None):
         DIF.__init__(self, name, members)
         if policies is None:
             policies = dict()
@@ -127,10 +127,8 @@ class NormalDIF(DIF):
 # @bindings: Binding of names on the processing system
 #
 class Node:
-    def __init__(self, name, difs = None,
-                 dif_registrations = None,
-                 registrations = None,
-                 bindings = None):
+    def __init__(self, name, difs=None, dif_registrations=None,
+                 registrations=None, bindings=None):
         self.name = name
         if difs is None:
             difs = list()
@@ -208,7 +206,7 @@ class Node:
         return other != None and self.name == other.name
 
     def __neq__(self, other):
-        return not (self == other)
+        return not self == other
 
     def add_dif(self, dif):
         self.difs.append(dif)
@@ -237,11 +235,11 @@ class Node:
         self._validate()
 
     def add_binding(self, name, ap):
-        self.dif_bindings[name] = ap
+        self.bindings[name] = ap
         self._validate()
 
     def del_binding(self, name):
-        del self.dif_bindings[name]
+        del self.bindings[name]
         self._validate()
 
 # Base class representing an IPC Process to be created in the experiment
@@ -276,17 +274,17 @@ class IPCP:
                                 and self.dif == other.dif
 
     def __neq__(self, other):
-        return not (self == other)
+        return not self == other
 
 class ShimEthIPCP(IPCP):
-    def __init__(self, name, node, dif, ifname = None):
+    def __init__(self, name, node, dif, ifname=None):
         IPCP.__init__(self, name, node, dif)
         self.ifname = ifname
 
 class ShimUDPIPCP(IPCP):
     def __init__(self, name, node, dif):
         IPCP.__init__(self, name, node, dif)
-        # TODO add IP and port
+        # TODO: add IP and port
 
 # Base class for ARCFIRE experiments
 #
@@ -294,7 +292,7 @@ class ShimUDPIPCP(IPCP):
 # @nodes: Nodes in the experiment
 #
 class Experiment:
-    def __init__(self, testbed, nodes = None):
+    def __init__(self, testbed, nodes=None):
         if nodes is None:
             nodes = list()
         self.nodes = nodes
@@ -396,7 +394,7 @@ class Experiment:
             for node in self.nodes:
                 if dif in node.dif_registrations:
                     dif_graphs[dif][node] = [] # init for later use
-                    if first == None: # pick any node for later use
+                    if first is None: # pick any node for later use
                         first = node
                     for lower_dif in node.dif_registrations[dif]:
                         if lower_dif not in neighsets:
@@ -413,7 +411,7 @@ class Experiment:
 
             self.enrollments.append([])
 
-            if first == None:
+            if first is None:
                 # This is a shim DIF, nothing to do
                 continue
 
@@ -452,7 +450,7 @@ class Experiment:
 
             else:
                 # This is a bug
-                assert(False)
+                assert False
 
         print("Enrollments:")
         for el in self.enrollments:
@@ -475,8 +473,8 @@ class Experiment:
                     continue
 
                 ipcp = dif.get_ipcp_class()(
-                                name = '%s.%s' % (dif.name, node.name),
-                                node = node, dif = dif)
+                    name='%s.%s' % (dif.name, node.name),
+                    node=node, dif=dif)
 
                 if dif in node.dif_registrations:
                     for lower in node.dif_registrations[dif]: