From: Melissa LeBlanc-Williams Date: Tue, 25 Aug 2020 23:14:17 +0000 (-0700) Subject: Linted new Pylint checks X-Git-Tag: 5.3.1^2 X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/d2e478aaa029730c2b59466ec28b5651da46cccc?ds=sidebyside Linted new Pylint checks --- diff --git a/src/adafruit_blinka/microcontroller/am335x/sysfs_pwmout.py b/src/adafruit_blinka/microcontroller/am335x/sysfs_pwmout.py index 2ba1359..b99e1cc 100644 --- a/src/adafruit_blinka/microcontroller/am335x/sysfs_pwmout.py +++ b/src/adafruit_blinka/microcontroller/am335x/sysfs_pwmout.py @@ -9,7 +9,7 @@ import os try: from microcontroller.pin import pwmOuts except ImportError: - raise RuntimeError("No PWM outputs defined for this board") + raise RuntimeError("No PWM outputs defined for this board") from ImportError # pylint: disable=unnecessary-pass class PWMError(IOError): @@ -105,7 +105,7 @@ class PWMOut: ) as f_export: f_export.write("%d\n" % self._pwmpin) except IOError as e: - raise PWMError(e.errno, "Exporting PWM pin: " + e.strerror) + raise PWMError(e.errno, "Exporting PWM pin: " + e.strerror) from IOError # Look up the period, for fast duty cycle updates self._period = self._get_period() @@ -135,7 +135,9 @@ class PWMOut: ) as f_unexport: f_unexport.write("%d\n" % self._pwmpin) except IOError as e: - raise PWMError(e.errno, "Unexporting PWM pin: " + e.strerror) + raise PWMError( + e.errno, "Unexporting PWM pin: " + e.strerror + ) from IOError except Exception as e: # due to a race condition for which I have not yet been # able to find the root cause, deinit() often fails @@ -192,7 +194,9 @@ class PWMOut: try: period_ns = int(period_ns) except ValueError: - raise PWMError(None, 'Unknown period value: "%s"' % period_ns) + raise PWMError( + None, 'Unknown period value: "%s"' % period_ns + ) from ValueError # Convert period from nanoseconds to seconds period = period_ns / 1e9 @@ -230,7 +234,9 @@ class PWMOut: try: duty_cycle_ns = int(duty_cycle_ns) except ValueError: - raise PWMError(None, 'Unknown duty cycle value: "%s"' % duty_cycle_ns) + raise PWMError( + None, 'Unknown duty cycle value: "%s"' % duty_cycle_ns + ) from ValueError # Convert duty cycle from nanoseconds to seconds duty_cycle = duty_cycle_ns / 1e9 diff --git a/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pin.py b/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pin.py index 165bca7..82fa6ea 100644 --- a/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pin.py +++ b/src/adafruit_blinka/microcontroller/amlogic/meson_g12_common/pin.py @@ -9,8 +9,8 @@ Linux kernel 5.4.y (mainline) """ import re -from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin import gpiod +from adafruit_blinka.microcontroller.generic_linux.libgpiod_pin import Pin chip0 = gpiod.Chip("0") chip1 = gpiod.Chip("1") diff --git a/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py b/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py index d2390f6..aef942a 100644 --- a/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py +++ b/src/adafruit_blinka/microcontroller/bcm283x/pulseio/PulseIn.py @@ -45,7 +45,9 @@ class PulseIn: print("Message Queue Key: ", self._mq.key) queues.append(self._mq) except sysv_ipc.ExistentialError: - raise RuntimeError("Message queue creation failed") + raise RuntimeError( + "Message queue creation failed" + ) from sysv_ipc.ExistentialError dir_path = os.path.dirname(os.path.realpath(__file__)) cmd = [ diff --git a/src/adafruit_blinka/microcontroller/generic_linux/i2c.py b/src/adafruit_blinka/microcontroller/generic_linux/i2c.py index 1870dfc..7be7514 100644 --- a/src/adafruit_blinka/microcontroller/generic_linux/i2c.py +++ b/src/adafruit_blinka/microcontroller/generic_linux/i2c.py @@ -25,7 +25,7 @@ class I2C: except FileNotFoundError: raise RuntimeError( "I2C Bus #%d not found, check if enabled in config!" % bus_num - ) + ) from RuntimeError # pylint: enable=unused-argument diff --git a/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py b/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py index 4ffa5c1..db9007a 100644 --- a/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py +++ b/src/adafruit_blinka/microcontroller/generic_linux/libgpiod_pin.py @@ -5,7 +5,7 @@ except ImportError: raise ImportError( "libgpiod Python bindings not found, please install and try again! See " "https://github.com/adafruit/Raspberry-Pi-Installer-Scripts/blob/master/libgpiod.sh" - ) + ) from ImportError class Pin: diff --git a/src/adafruit_blinka/microcontroller/generic_linux/periphery_pin.py b/src/adafruit_blinka/microcontroller/generic_linux/periphery_pin.py index 69044f8..0986d01 100644 --- a/src/adafruit_blinka/microcontroller/generic_linux/periphery_pin.py +++ b/src/adafruit_blinka/microcontroller/generic_linux/periphery_pin.py @@ -5,7 +5,7 @@ except ImportError: raise ImportError( "Periphery Python bindings not found, please install and try again! " "Try running 'pip3 install python-periphery'" - ) + ) from ImportError class Pin: diff --git a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_analogin.py b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_analogin.py index bf6988b..e8a7376 100644 --- a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_analogin.py +++ b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_analogin.py @@ -13,7 +13,7 @@ from adafruit_blinka import ContextManaged try: from microcontroller.pin import analogIns except ImportError: - raise RuntimeError("No Analog Inputs defined for this board") + raise RuntimeError("No Analog Inputs defined for this board") from ImportError class AnalogIn(ContextManaged): diff --git a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_analogout.py b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_analogout.py index ec8b6c6..56263d3 100644 --- a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_analogout.py +++ b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_analogout.py @@ -13,7 +13,7 @@ from adafruit_blinka import ContextManaged try: from microcontroller.pin import analogOuts except ImportError: - raise RuntimeError("No Analog Outputs defined for this board") + raise RuntimeError("No Analog Outputs defined for this board") from ImportError class AnalogOut(ContextManaged): diff --git a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pin.py b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pin.py index c5b56e6..50c27a7 100644 --- a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pin.py +++ b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pin.py @@ -135,7 +135,7 @@ class Pin: with open("/sys/class/gpio/export", "w") as f_export: f_export.write("{:d}\n".format(self.id)) except IOError as e: - raise GPIOError(e.errno, "Exporting GPIO: " + e.strerror) + raise GPIOError(e.errno, "Exporting GPIO: " + e.strerror) from IOError # Loop until GPIO is exported exported = False @@ -164,7 +164,7 @@ class Pin: ): raise GPIOError( e.errno, "Setting GPIO direction: " + e.strerror - ) + ) from IOError time.sleep(self.GPIO_OPEN_DELAY) else: @@ -173,13 +173,15 @@ class Pin: with open(os.path.join(gpio_path, "direction"), "w") as f_direction: f_direction.write(direction.lower() + "\n") except IOError as e: - raise GPIOError(e.errno, "Setting GPIO direction: " + e.strerror) + raise GPIOError( + e.errno, "Setting GPIO direction: " + e.strerror + ) from IOError # Open value try: self._fd = os.open(os.path.join(gpio_path, "value"), os.O_RDWR) except OSError as e: - raise GPIOError(e.errno, "Opening GPIO: " + e.strerror) + raise GPIOError(e.errno, "Opening GPIO: " + e.strerror) from OSError self._path = gpio_path @@ -192,7 +194,7 @@ class Pin: try: os.close(self._fd) except OSError as e: - raise GPIOError(e.errno, "Closing GPIO: " + e.strerror) + raise GPIOError(e.errno, "Closing GPIO: " + e.strerror) from OSError self._fd = None @@ -202,20 +204,20 @@ class Pin: os.write(unexport_fd, "{:d}\n".format(self.id).encode()) os.close(unexport_fd) except OSError as e: - raise GPIOError(e.errno, "Unexporting GPIO: " + e.strerror) + raise GPIOError(e.errno, "Unexporting GPIO: " + e.strerror) from OSError def _read(self): # Read value try: buf = os.read(self._fd, 2) except OSError as e: - raise GPIOError(e.errno, "Reading GPIO: " + e.strerror) + raise GPIOError(e.errno, "Reading GPIO: " + e.strerror) from OSError # Rewind try: os.lseek(self._fd, 0, os.SEEK_SET) except OSError as e: - raise GPIOError(e.errno, "Rewinding GPIO: " + e.strerror) + raise GPIOError(e.errno, "Rewinding GPIO: " + e.strerror) from OSError if buf[0] == b"0"[0]: return False @@ -235,13 +237,13 @@ class Pin: else: os.write(self._fd, b"0\n") except OSError as e: - raise GPIOError(e.errno, "Writing GPIO: " + e.strerror) + raise GPIOError(e.errno, "Writing GPIO: " + e.strerror) from OSError # Rewind try: os.lseek(self._fd, 0, os.SEEK_SET) except OSError as e: - raise GPIOError(e.errno, "Rewinding GPIO: " + e.strerror) + raise GPIOError(e.errno, "Rewinding GPIO: " + e.strerror) from OSError @property def chip_name(self): @@ -270,9 +272,13 @@ class Pin: label = f_label.read() except (GPIOError, IOError) as e: if isinstance(e, IOError): - raise GPIOError(e.errno, "Reading gpiochip label: " + e.strerror) + raise GPIOError( + e.errno, "Reading gpiochip label: " + e.strerror + ) from IOError - raise GPIOError(None, "Reading gpiochip label: " + e.strerror) + raise GPIOError( + None, "Reading gpiochip label: " + e.strerror + ) from GPIOError return label.strip() @@ -284,7 +290,9 @@ class Pin: with open(os.path.join(self._path, "direction"), "r") as f_direction: direction = f_direction.read() except IOError as e: - raise GPIOError(e.errno, "Getting GPIO direction: " + e.strerror) + raise GPIOError( + e.errno, "Getting GPIO direction: " + e.strerror + ) from IOError return direction.strip() @@ -299,7 +307,9 @@ class Pin: with open(os.path.join(self._path, "direction"), "w") as f_direction: f_direction.write(direction.lower() + "\n") except IOError as e: - raise GPIOError(e.errno, "Setting GPIO direction: " + e.strerror) + raise GPIOError( + e.errno, "Setting GPIO direction: " + e.strerror + ) from IOError direction = property(_get_direction, _set_direction) diff --git a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py index 6cf477c..4fc8e23 100644 --- a/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py +++ b/src/adafruit_blinka/microcontroller/generic_linux/sysfs_pwmout.py @@ -9,7 +9,7 @@ import os try: from microcontroller.pin import pwmOuts except ImportError: - raise RuntimeError("No PWM outputs defined for this board") + raise RuntimeError("No PWM outputs defined for this board") from ImportError # pylint: disable=unnecessary-pass @@ -107,7 +107,7 @@ class PWMOut: with open(os.path.join(channel_path, self._export_path), "w") as f_export: f_export.write("%d\n" % self._pwmpin) except IOError as e: - raise PWMError(e.errno, "Exporting PWM pin: " + e.strerror) + raise PWMError(e.errno, "Exporting PWM pin: " + e.strerror) from IOError # self._set_enabled(False) # This line causes a write error when trying to enable @@ -136,7 +136,9 @@ class PWMOut: ) as f_unexport: f_unexport.write("%d\n" % self._pwmpin) except IOError as e: - raise PWMError(e.errno, "Unexporting PWM pin: " + e.strerror) + raise PWMError( + e.errno, "Unexporting PWM pin: " + e.strerror + ) from IOError self._channel = None self._pwmpin = None @@ -184,7 +186,9 @@ class PWMOut: try: period_ns = int(period_ns) except ValueError: - raise PWMError(None, 'Unknown period value: "%s"' % period_ns) + raise PWMError( + None, 'Unknown period value: "%s"' % period_ns + ) from ValueError # Convert period from nanoseconds to seconds period = period_ns / 1e9 @@ -222,7 +226,9 @@ class PWMOut: try: duty_cycle_ns = int(duty_cycle_ns) except ValueError: - raise PWMError(None, 'Unknown duty cycle value: "%s"' % duty_cycle_ns) + raise PWMError( + None, 'Unknown duty cycle value: "%s"' % duty_cycle_ns + ) from ValueError # Convert duty cycle from nanoseconds to seconds duty_cycle = duty_cycle_ns / 1e9 diff --git a/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py b/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py index a4a1d99..66d406d 100644 --- a/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py +++ b/src/adafruit_blinka/microcontroller/mcp2221/mcp2221.py @@ -12,7 +12,6 @@ MCP2221_RESET_DELAY = float(os.environ.get("BLINKA_MCP2221_RESET_DELAY", 0.5)) # from the C driver # http://ww1.microchip.com/downloads/en/DeviceDoc/mcp2221_0_1.tar.gz # others (???) determined during driver developement -# pylint: disable=bad-whitespace RESP_ERR_NOERR = 0x00 RESP_ADDR_NACK = 0x25 RESP_READ_ERR = 0x7F @@ -35,7 +34,6 @@ RESP_I2C_WRITINGNOSTOP = 0x45 # ??? MCP2221_RETRY_MAX = 50 MCP2221_MAX_I2C_DATA_LEN = 60 MASK_ADDR_NACK = 0x40 -# pylint: enable=bad-whitespace class MCP2221: diff --git a/src/adafruit_blinka/microcontroller/nova/pwmout.py b/src/adafruit_blinka/microcontroller/nova/pwmout.py index 4139380..2ff0c25 100644 --- a/src/adafruit_blinka/microcontroller/nova/pwmout.py +++ b/src/adafruit_blinka/microcontroller/nova/pwmout.py @@ -3,7 +3,7 @@ try: from microcontroller.pin import pwmOuts except ImportError: - raise RuntimeError("No PWM outputs defined for this board") + raise RuntimeError("No PWM outputs defined for this board") from ImportError from microcontroller.pin import Pin diff --git a/src/adafruit_blinka/microcontroller/nxp_lpc4330/pin.py b/src/adafruit_blinka/microcontroller/nxp_lpc4330/pin.py index cfa96fe..24d542d 100644 --- a/src/adafruit_blinka/microcontroller/nxp_lpc4330/pin.py +++ b/src/adafruit_blinka/microcontroller/nxp_lpc4330/pin.py @@ -4,11 +4,11 @@ try: from greatfet.interfaces.adc import ADC gf = GreatFET() -except: +except ModuleNotFoundError: raise RuntimeError( "Unable to create GreatFET object. Make sure library is " "installed and the device is connected." - ) + ) from ModuleNotFoundError class Pin: diff --git a/src/adafruit_blinka/microcontroller/nxp_lpc4330/pwmout.py b/src/adafruit_blinka/microcontroller/nxp_lpc4330/pwmout.py index 5bb7889..91c3ede 100644 --- a/src/adafruit_blinka/microcontroller/nxp_lpc4330/pwmout.py +++ b/src/adafruit_blinka/microcontroller/nxp_lpc4330/pwmout.py @@ -5,7 +5,7 @@ from greatfet import GreatFET try: from microcontroller.pin import pwmOuts except ImportError: - raise RuntimeError("No PWM outputs defined for this board") + raise RuntimeError("No PWM outputs defined for this board") from ImportError # pylint: disable=unnecessary-pass class PWMError(IOError): diff --git a/src/busio.py b/src/busio.py index 17e6c28..d63c815 100755 --- a/src/busio.py +++ b/src/busio.py @@ -293,7 +293,7 @@ class SPI(Lockable): except AttributeError: raise NotImplementedError( "Frequency attribute not implemented for this platform" - ) + ) from AttributeError def write(self, buf, start=0, end=None): """Write to the SPI device"""