Merge pull request #8 from jerryneedell/jerryn_fixpylint

some pylint fixes

Author: sommersoft

adafruit_rfm69.py

@@ -71,7 +71,7 @@
 
 from micropython import const
 
-import adafruit_bus_device.spi_device as spi_device
+import adafruit_bus_device.spi_device as spidev
 
 
 __version__ = "0.0.0-auto.0"
@@ -293,8 +293,8 @@ def __init__(self, spi, cs, reset, frequency, *, sync_word=b'\x2D\xD4',
         self._tx_power = 13
         self.high_power = high_power
         # Device support SPI mode 0 (polarity & phase = 0) up to a max of 10mhz.
-        self._device = spi_device.SPIDevice(spi, cs, baudrate=baudrate,
-                                            polarity=0, phase=0)
+        self._device = spidev.SPIDevice(spi, cs, baudrate=baudrate,
+                                        polarity=0, phase=0)
         # Setup reset as a digital output that's low.
         self._reset = reset
         self._reset.switch_to_output(value=False)
@@ -585,17 +585,16 @@ def tx_power(self):
         if pa0 and not pa1 and not pa2:
             # -18 to 13 dBm range
             return -18 + self.output_power
-        elif not pa0 and pa1 and not pa2:
+        if not pa0 and pa1 and not pa2:
             # -2 to 13 dBm range
             return -18 + self.output_power
-        elif not pa0 and pa1 and pa2 and not self.high_power:
+        if not pa0 and pa1 and pa2 and not self.high_power:
             # 2 to 17 dBm range
             return -14 + self.output_power
-        elif not pa0 and pa1 and pa2 and self.high_power:
+        if not pa0 and pa1 and pa2 and self.high_power:
             # 5 to 20 dBm range
             return -11 + self.output_power
-        else:
-            raise RuntimeError('Power amplifiers in unknown state!')
+        raise RuntimeError('Power amplifiers in unknown state!')
 
     @tx_power.setter
     def tx_power(self, val):