Merge pull request #599 from gleybersonandrade/linter

Fix new linter issues

Author: hdiogenes

pyof/foundation/base.py

@@ -71,7 +71,7 @@ def __str__(self):
     def __eq__(self, other):
         if isinstance(other, self.__class__):
             return self.pack() == other.pack()
-        elif hasattr(other, 'value'):
+        if hasattr(other, 'value'):
             return self.value == other.value
         return self.value == other
 
@@ -141,10 +141,9 @@ def value(self):
             if isinstance(self._value, self.enum_ref):
                 return self._value.value
             return self._value
-        elif self.is_bitmask():
+        if self.is_bitmask():
             return self._value.bitmask
-        else:
-            return self._value
+        return self._value
 
     def pack(self, value=None):
         r"""Pack the value as a binary representation.
@@ -272,10 +271,10 @@ class MetaStruct(type):
 
     # pylint: disable=unused-argument
     @classmethod
-    def __prepare__(mcs, name, bases, **kwargs):
+    def __prepare__(cls, name, bases, **kwargs):
         return OrderedDict()
 
-    def __new__(mcs, name, bases, classdict, **kwargs):
+    def __new__(cls, name, bases, classdict, **kwargs):
         """Inherit attributes from parent class and update their versions.
 
         Here is the moment that the new class is going to be created. During
@@ -321,7 +320,7 @@ class and place them as class attributes on the class being created.
                                                                curr_version)
 
                     if attr_name == 'header':
-                        attr = mcs._header_message_type_update(obj, attr)
+                        attr = cls._header_message_type_update(obj, attr)
 
                     inherited_attributes.update([attr])
                 #: We are going to inherit just from the 'closest parent'
@@ -341,7 +340,7 @@ class and place them as class attributes on the class being created.
             inherited_attributes.update(classdict)
             classdict = inherited_attributes
 
-        return super().__new__(mcs, name, bases, classdict, **kwargs)
+        return super().__new__(cls, name, bases, classdict, **kwargs)
 
     @staticmethod
     def _header_message_type_update(obj, attr):
@@ -478,7 +477,7 @@ def get_pyof_obj_new_version(name, obj, new_version):
         return (name, obj)
 
 
-class GenericStruct(object, metaclass=MetaStruct):
+class GenericStruct(metaclass=MetaStruct):
     """Class inherited by all OpenFlow structs.
 
     If you need to insert a method that will be used by all structs, this is
@@ -536,7 +535,7 @@ def _validate_attributes_type(self):
         for _attr, _class in self._get_attributes():
             if isinstance(_attr, _class):
                 return True
-            elif issubclass(_class, GenericType):
+            if issubclass(_class, GenericType):
                 if GenericStruct._attr_fits_into_class(_attr, _class):
                     return True
             elif not isinstance(_attr, _class):
@@ -656,12 +655,10 @@ def get_size(self, value=None):
         if value is None:
             return sum(cls_val.get_size(obj_val) for obj_val, cls_val in
                        self._get_attributes())
-        elif isinstance(value, type(self)):
+        if isinstance(value, type(self)):
             return value.get_size()
-        else:
-            msg = "{} is not an instance of {}".format(value,
-                                                       type(self).__name__)
-            raise PackException(msg)
+        msg = "{} is not an instance of {}".format(value, type(self).__name__)
+        raise PackException(msg)
 
     def pack(self, value=None):
         """Pack the struct in a binary representation.
@@ -682,24 +679,21 @@ def pack(self, value=None):
                 error_msg = "Error on validation prior to pack() on class "
                 error_msg += "{}.".format(type(self).__name__)
                 raise ValidationError(error_msg)
-            else:
-                message = b''
-                # pylint: disable=no-member
-                for attr_info in self._get_named_attributes():
-                    name, instance_value, class_value = attr_info
-                    try:
-                        message += class_value.pack(instance_value)
-                    except PackException as pack_exception:
-                        cls = type(self).__name__
-                        msg = f'{cls}.{name} - {pack_exception}'
-                        raise PackException(msg)
-                return message
-        elif isinstance(value, type(self)):
+            message = b''
+            # pylint: disable=no-member
+            for attr_info in self._get_named_attributes():
+                name, instance_value, class_value = attr_info
+                try:
+                    message += class_value.pack(instance_value)
+                except PackException as pack_exception:
+                    cls = type(self).__name__
+                    msg = f'{cls}.{name} - {pack_exception}'
+                    raise PackException(msg)
+            return message
+        if isinstance(value, type(self)):
             return value.pack()
-        else:
-            msg = "{} is not an instance of {}".format(value,
-                                                       type(self).__name__)
-            raise PackException(msg)
+        msg = "{} is not an instance of {}".format(value, type(self).__name__)
+        raise PackException(msg)
 
     def unpack(self, buff, offset=0):
         """Unpack a binary struct into this object's attributes.
@@ -804,12 +798,10 @@ def pack(self, value=None):
         if value is None:
             self.update_header_length()
             return super().pack()
-        elif isinstance(value, type(self)):
+        if isinstance(value, type(self)):
             return value.pack()
-        else:
-            msg = "{} is not an instance of {}".format(value,
-                                                       type(self).__name__)
-            raise PackException(msg)
+        msg = "{} is not an instance of {}".format(value, type(self).__name__)
+        raise PackException(msg)
 
     def unpack(self, buff, offset=0):
         """Unpack a binary message into this object's attributes.
@@ -850,7 +842,7 @@ class MetaBitMask(type):
     access object.ELEMENT and recover either values or names).
     """
 
-    def __new__(mcs, name, bases, classdict):
+    def __new__(cls, name, bases, classdict):
         """Convert class attributes into enum elements."""
         _enum = OrderedDict([(key, value) for key, value in classdict.items()
                              if key[0] != '_' and not
@@ -861,7 +853,7 @@ def __new__(mcs, name, bases, classdict):
                          if key[0] == '_' or hasattr(value, '__call__') or
                          isinstance(value, property)}
             classdict['_enum'] = _enum
-        return type.__new__(mcs, name, bases, classdict)
+        return type.__new__(cls, name, bases, classdict)
 
     def __getattr__(cls, name):
         return cls._enum[name]
@@ -873,7 +865,7 @@ def __dir__(cls):
         return res
 
 
-class GenericBitMask(object, metaclass=MetaBitMask):
+class GenericBitMask(metaclass=MetaBitMask):
     """Base class for enums that use bitmask values."""
 
     def __init__(self, bitmask=None):

pyof/foundation/basic_types.py

@@ -59,7 +59,6 @@ def unpack(self, buff, offset=0):
             buff: Buffer where data is located.
             offset (int): Where data stream begins.
         """
-        pass
 
     def pack(self, value=None):
         """Pack the object.
@@ -472,12 +471,11 @@ def pack(self, value=None):
 
         if hasattr(value, 'pack') and callable(value.pack):
             return value.pack()
-        elif isinstance(value, bytes):
+        if isinstance(value, bytes):
             return value
-        elif value is None:
+        if value is None:
             return b''
-        else:
-            raise ValueError(f"BinaryData can't be {type(value)} = '{value}'")
+        raise ValueError(f"BinaryData can't be {type(value)} = '{value}'")
 
     def unpack(self, buff, offset=0):
         """Unpack a binary message into this object's attributes.
@@ -606,7 +604,7 @@ def get_size(self, value=None):
             if not self:
                 # If this is a empty list, then returns zero
                 return 0
-            elif issubclass(type(self[0]), GenericType):
+            if issubclass(type(self[0]), GenericType):
                 # If the type of the elements is GenericType, then returns the
                 # length of the list multiplied by the size of the GenericType.
                 return len(self) * self[0].get_size()

pyof/foundation/exceptions.py

@@ -51,10 +51,6 @@ def __str__(self):
 class UnpackException(Exception):
     """Error while unpacking."""
 
-    pass
-
 
 class PackException(Exception):
     """Error while unpacking."""
-
-    pass

pyof/foundation/network_types.py

@@ -188,7 +188,6 @@ def _validate(self):
         """Assure this is a valid VLAN header instance."""
         if self.tpid.value not in (EtherType.VLAN, EtherType.VLAN_QINQ):
             raise UnpackException
-        return
 
     def unpack(self, buff, offset=0):
         """Unpack a binary struct into this object's attributes.
@@ -409,13 +408,10 @@ def pack(self, value=None):
             output = self.header.pack()
             output += self.value.pack()
             return output
-
-        elif isinstance(value, type(self)):
+        if isinstance(value, type(self)):
             return value.pack()
-        else:
-            msg = "{} is not an instance of {}".format(value,
-                                                       type(self).__name__)
-            raise PackException(msg)
+        msg = "{} is not an instance of {}".format(value, type(self).__name__)
+        raise PackException(msg)
 
     def unpack(self, buff, offset=0):
         """Unpack a binary message into this object's attributes.

pyof/v0x01/asynchronous/error_msg.py

@@ -223,12 +223,10 @@ def pack(self, value=None):
             if data_backup is not None:
                 self.data = data_backup
             return packed
-        elif isinstance(value, type(self)):
+        if isinstance(value, type(self)):
             return value.pack()
-        else:
-            msg = "{} is not an instance of {}".format(value,
-                                                       type(self).__name__)
-            raise PackException(msg)
+        msg = "{} is not an instance of {}".format(value, type(self).__name__)
+        raise PackException(msg)
 
     def unpack(self, buff, offset=0):
         """Unpack *buff* into this object.

pyof/v0x01/common/action.py

@@ -119,7 +119,7 @@ class ActionOutput(ActionHeader):
     port = UBInt16()
     max_length = UBInt16()
 
-    _allowed_types = ActionType.OFPAT_OUTPUT,
+    _allowed_types = (ActionType.OFPAT_OUTPUT,)
 
     def __init__(self, port=None, max_length=UBINT16_MAX_VALUE):
         """Create an ActionOutput with the optional parameters below.
@@ -143,7 +143,7 @@ class ActionStripVlan(ActionHeader):
 
     pad = Pad(4)
 
-    _allowed_types = ActionType.OFPAT_STRIP_VLAN,
+    _allowed_types = (ActionType.OFPAT_STRIP_VLAN,)
 
     def __init__(self):
         """Construct the ActionHeader with the appropriate ActionType.
@@ -168,7 +168,7 @@ class ActionEnqueue(ActionHeader):
     pad = Pad(6)
     queue_id = UBInt32()
 
-    _allowed_types = ActionType.OFPAT_ENQUEUE,
+    _allowed_types = (ActionType.OFPAT_ENQUEUE,)
 
     def __init__(self, port=None, queue_id=None):
         """Create an ActionEnqueue with the optional parameters below.
@@ -194,7 +194,7 @@ class ActionVlanVid(ActionHeader):
     #: Pad for bit alignment.
     pad2 = Pad(2)
 
-    _allowed_types = ActionType.OFPAT_SET_VLAN_VID,
+    _allowed_types = (ActionType.OFPAT_SET_VLAN_VID,)
 
     def __init__(self, vlan_id=None):
         """Create an ActionVlanVid with the optional parameters below.
@@ -213,7 +213,7 @@ class ActionVlanPCP(ActionHeader):
     #: Pad for bit alignment.
     pad = Pad(3)
 
-    _allowed_types = ActionType.OFPAT_SET_VLAN_PCP,
+    _allowed_types = (ActionType.OFPAT_SET_VLAN_PCP,)
 
     def __init__(self, vlan_pcp=None):
         """Create an ActionVlanPCP with the optional parameters below.
@@ -282,7 +282,7 @@ class ActionNWTos(ActionHeader):
     #: Pad for bit alignment.
     pad = Pad(3)
 
-    _allowed_types = ActionType.OFPAT_SET_NW_TOS,
+    _allowed_types = (ActionType.OFPAT_SET_NW_TOS,)
 
     def __init__(self, action_type=None, nw_tos=None):
         """Create an ActionNWTos with the optional parameters below.
@@ -327,7 +327,7 @@ class ActionVendorHeader(ActionHeader):
 
     vendor = UBInt32()
 
-    _allowed_types = ActionType.OFPAT_VENDOR,
+    _allowed_types = (ActionType.OFPAT_VENDOR,)
 
     def __init__(self, length=None, vendor=None):
         """Create an ActionVendorHeader with the optional parameters below.

pyof/v0x01/controller2switch/packet_out.py

@@ -69,12 +69,10 @@ def pack(self, value=None):
         if value is None:
             self._update_actions_len()
             return super().pack()
-        elif isinstance(value, type(self)):
+        if isinstance(value, type(self)):
             return value.pack()
-        else:
-            msg = "{} is not an instance of {}".format(value,
-                                                       type(self).__name__)
-            raise PackException(msg)
+        msg = "{} is not an instance of {}".format(value, type(self).__name__)
+        raise PackException(msg)
 
     def unpack(self, buff, offset=0):
         """Unpack a binary message into this object's attributes.

pyof/v0x01/controller2switch/stats_reply.py

@@ -83,7 +83,7 @@ def _get_body_instance(self):
 
         if pyof_class is None:
             return BinaryData(b'')
-        elif pyof_class is DescStats:
+        if pyof_class is DescStats:
             return pyof_class()
 
         return FixedTypeList(pyof_class=pyof_class)