flake8: fix warnings

Signed-off-by: Heiko Thiery <[email protected]>

Author: hthiery

pyipmi/__init__.py

@@ -35,7 +35,7 @@
 from . import msgs
 
 from .errors import IpmiTimeoutError, CompletionCodeError, RetryError
-from .msgs.registry import create_request_by_name, create_message
+from .msgs.registry import create_request_by_name
 from .session import Session
 from .utils import check_completion_code, is_string
 

pyipmi/chassis.py

@@ -36,6 +36,7 @@
 BOOT_PARAMETER_BOOT_INITIATOR_INFO = 6
 BOOT_PARAMETER_BOOT_INITIATOR_MAILBOX = 7
 
+
 class BootDevice(str, Enum):
     NO_OVERRIDE = "no override",
     PXE = "pxe",
@@ -91,6 +92,7 @@ def data_to_boot_mode(data):
     boot_mode = "legacy" if boot_mode_raw == 0 else "efi"
     return boot_mode
 
+
 def data_to_boot_persistency(data):
     """
     Convert a `GetSystemBootOptions(BOOT_PARAMETER_BOOT_FLAGS)` response data
@@ -99,6 +101,7 @@ def data_to_boot_persistency(data):
     boot_persistent_raw = (data[0] >> 6) & 1
     return boot_persistent_raw == 1
 
+
 def data_to_boot_device(data):
     """
     Convert a `GetSystemBootOptions(BOOT_PARAMETER_BOOT_FLAGS)` response data
@@ -107,6 +110,7 @@ def data_to_boot_device(data):
     boot_device_raw = (data[1] >> 2) & 0b1111
     return CONVERT_RAW_TO_BOOT_DEVICE[boot_device_raw]
 
+
 def boot_options_to_data(boot_device, boot_mode, boot_persistency):
     """
     Convert a boot mode (string), boot device (string) and boot persistency (bool)
@@ -138,6 +142,7 @@ def boot_options_to_data(boot_device, boot_mode, boot_persistency):
     data = ByteBuffer([boot_mode_raw | boot_persistent_raw, device_raw << 2, 0, 0, 0])
     return data
 
+
 class Chassis(object):
     def get_chassis_status(self):
         return ChassisStatus(self.send_message_with_name('GetChassisStatus'))
@@ -223,9 +228,9 @@ class ChassisStatus(State):
     fault = None
     control_fault = None
     restore_policy = None
-    id_cmd_state_info_support=None
-    chassis_id_state=None
-    front_panel_button_capabilities=None
+    id_cmd_state_info_support = None
+    chassis_id_state = None
+    front_panel_button_capabilities = None
     last_event = []
     chassis_state = []
 
@@ -236,10 +241,12 @@ def _from_response(self, rsp):
         self.fault = bool(rsp.current_power_state.power_fault)
         self.control_fault = bool(rsp.current_power_state.power_control_fault)
         self.restore_policy = rsp.current_power_state.power_restore_policy
-        self.id_cmd_state_info_support=bool(rsp.misc_chassis_state.id_cmd_state_info_support)
-        self.chassis_id_state=rsp.misc_chassis_state.chassis_id_state
+        self.id_cmd_state_info_support = \
+                bool(rsp.misc_chassis_state.id_cmd_state_info_support)
+        self.chassis_id_state = rsp.misc_chassis_state.chassis_id_state
         if rsp.front_panel_button_capabilities is not None:
-            self.front_panel_button_capabilities=rsp.front_panel_button_capabilities
+            self.front_panel_button_capabilities = \
+                    rsp.front_panel_button_capabilities
 
         if rsp.last_power_event.ac_failed:
             self.last_event.append('ac_failed')

pyipmi/emulation.py

@@ -3,7 +3,6 @@
 import os
 import random
 import socket
-import sys
 import threading
 import yaml
 
@@ -20,7 +19,6 @@
                          create_response_message, create_request_by_name)
 from pyipmi.msgs import constants
 from pyipmi.session import Session
-from pyipmi.utils import ByteBuffer
 
 UDP_IP = "127.0.0.1"
 UDP_PORT = 1623
@@ -87,8 +85,6 @@ def handle_get_device_id(context, req):
 @register_message_handler("GetFruInventoryAreaInfo")
 def handle_fru_inventory_are_info(context, req):
     rsp = create_response_message(req)
-    fru_file_name = None
-
     cfg = context.config
 
     try:
@@ -102,7 +98,6 @@ def handle_fru_inventory_are_info(context, req):
         rsp.completion_code = constants.CC_REQ_DATA_NOT_PRESENT
         return rsp
 
-
     try:
         statinfo = os.stat(fru_filename)
         rsp.area_size = statinfo.st_size
@@ -117,8 +112,6 @@ def handle_fru_inventory_are_info(context, req):
 @register_message_handler("ReadFruData")
 def handle_fru_read(context, req):
     rsp = create_response_message(req)
-    fru_file_name = None
-
     cfg = context.config
 
     try:
@@ -197,19 +190,13 @@ def handle_reserve_device_sdr_repository(context, req):
     return rsp
 
 
-#@register_message_handler("GetDeviceSdr")
-#def handle_get_device_sdr(config, session, req):
-#    rsp = create_response_message(req)
-#    return rsp
-
 @register_message_handler("SendMessage")
 def handle_send_message(context, req):
     rsp = create_response_message(req)
     rsp.completion_code = constants.CC_PARAM_OUT_OF_RANGE
     return rsp
 
 
-
 def handle_ipmi_request_msg(context, req):
     try:
         fct = handler_registry[type(req)]
@@ -293,7 +280,7 @@ def _create_invalid_response(ipmi_sdu):
 
     tx_data = ipmb.encode_ipmb_msg(rsp_header, data)
     log().debug('IPMI TX: {}: {:s}'.format(rsp,
-            ' '.join('%02x' % b for b in array('B', tx_data))))
+                ' '.join('%02x' % b for b in array('B', tx_data))))
 
     # rmcp ipmi rsp msg
     ipmi_tx = rmcp.IpmiMsg(context.session)
@@ -385,7 +372,7 @@ def main(args=None):
     connections = {}
 
     while True:
-        pdu, addr = sock.recvfrom(1024) # buffer size is 1024 bytes
+        pdu, addr = sock.recvfrom(1024)  # buffer size is 1024 bytes
 
         # create new connection
         if addr not in connections:

pyipmi/interfaces/aardvark.py

@@ -25,9 +25,9 @@
 
 try:
     import pyaardvark
-except ImportError: # python 2
+except ImportError:  # python 2
     pyaardvark = None
-except RuntimeError: # python 3
+except RuntimeError:  # python 3
     pyaardvark = None
 
 

pyipmi/interfaces/ipmb.py

@@ -107,7 +107,7 @@ def decode(self, data):
         self.rq_sa = data[0]
         self.netfn = data[1] >> 2
         self.rq_lun = data[1] & 3
-        self.checksum =  data[2]
+        self.checksum = data[2]
         self.rs_sa = data[3]
         self.rq_seq = data[4] >> 2
         self.rs_lun = data[4] & 3

pyipmi/interfaces/ipmbdev.py

@@ -73,7 +73,7 @@ def _receive_raw(self, header):
                 raise IpmiTimeoutError()
 
             r, w, e = select.select([self._dev], [], [], timeout)
-            if not self._dev in r:
+            if self._dev not in r:
                 poll_returned_no_data = True
                 continue
 

pyipmi/interfaces/ipmitool.py

@@ -112,7 +112,6 @@ def _parse_output(self, output):
             if self.re_unable_establish.match(line):
                 raise IpmiConnectionError('ipmitool: {}'.format(line))
 
-
             # Check for completion code
             match_completion_code = self.re_completion_code.match(line)
             if match_completion_code:
@@ -268,7 +267,6 @@ def _build_open_ipmitool_cmd(self, target, lun, netfn, raw_bytes):
 
         return cmd
 
-
     @staticmethod
     def _run_ipmitool(cmd):
         """Legacy call of ipmitool (will be removed in future)."""

pyipmi/ipmitool.py

@@ -619,12 +619,12 @@ def main():
         if verbose:
             traceback.print_exc()
         sys.exit(1)
-    except pyipmi.errors.IpmiTimeoutError as e:
+    except pyipmi.errors.IpmiTimeoutError:
         print('Command timed out')
         if verbose:
             traceback.print_exc()
         sys.exit(1)
-    except KeyboardInterrupt as e:
+    except KeyboardInterrupt:
         if verbose:
             traceback.print_exc()
         sys.exit(1)

pyipmi/lan.py

@@ -68,13 +68,15 @@ def data_to_ip_address(data):
     """
     return '.'.join(map(str, data))
 
+
 def ip_address_to_data(ip_address):
     """
     Convert an ip address (string) into a
     `SetLanConfigurationParameters(LAN_PARAMETER_IP_ADDRESS)` request data.
     """
     return ByteBuffer(map(int, ip_address.split('.')))
 
+
 def data_to_ip_source(data):
     """
     Convert a `GetLanConfigurationParameters(LAN_PARAMETER_IP_ADDRESS_SOURCE)`
@@ -83,6 +85,7 @@ def data_to_ip_source(data):
     # The ip source is encoded in the last 4 bits of the response
     return CONVERT_RAW_TO_IP_SRC[data[0] & 0b1111]
 
+
 def ip_source_to_data(ip_source):
     """
     Convert an ip source (string) into a
@@ -96,6 +99,7 @@ def ip_source_to_data(ip_source):
         raise ValueError(f"Unknown value for ip_source argument: {ip_source}. Possible values are: dhcp, static.")
     return data
 
+
 def data_to_mac_address(data):
     """
     Convert a `GetLanConfigurationParameters(LAN_PARAMETER_MAC_ADDRESS)` response
@@ -104,6 +108,7 @@ def data_to_mac_address(data):
     """
     return ':'.join([f"{i:02x}" for i in data])
 
+
 def data_to_vlan(data):
     """
     Convert a `GetLanConfigurationParameters(LAN_PARAMETER_802_1Q_VLAN_ID)` response
@@ -126,6 +131,7 @@ def data_to_vlan(data):
     #       0 0 0 0  0 0 0 1  1 0 0 0  1 0 1 0 = 394
     return ((data[1] & 0b1111) << 8) | data[0]
 
+
 def vlan_to_data(vlan):
     """
     Convert a vlan (int) into a

pyipmi/messaging.py

@@ -21,6 +21,7 @@
 from .utils import check_completion_code
 from .state import State
 
+
 class PasswordOperation(int, Enum):
     DISABLE = 0b00
     ENABLE = 0b01
@@ -58,6 +59,7 @@ class UserPrivilegeLevel(str, Enum):
     UserPrivilegeLevel.NO_ACCESS:     0x0F
 }
 
+
 class Messaging(object):
     def get_channel_authentication_capabilities(self, channel, priv_lvl):
         req = create_request_by_name('GetChannelAuthenticationCapabilities')
@@ -128,6 +130,7 @@ def disable_user(self, userid):
         rsp = self.send_message(req)
         check_completion_code(rsp.completion_code)
 
+
 class ChannelAuthenticationCapabilities(State):
 
     _functions = {
@@ -139,7 +142,7 @@ class ChannelAuthenticationCapabilities(State):
     }
 
     def _from_response(self, rsp):
-        self.channel= rsp.channel_number
+        self.channel = rsp.channel_number
         self.auth_types = []
 
         self.ipmi_1_5 = False
@@ -169,6 +172,7 @@ def __str__(self):
         s += '  Max Auth. type: %s\n' % self.get_max_auth_type()
         return s
 
+
 class UserAccess(State):
 
     def _from_response(self, rsp):