Restore vertical alignment removed in error, fix lint warning.

Author: tdicola

adafruit_fxos8700.py

@@ -37,37 +37,39 @@
 from micropython import const
 
 # Register addresses and other constants:
-_FXOS8700_ADDRESS = const(0x1F)   # 0011111
-_FXOS8700_ID = const(0xC7)        # 1100 0111
-_FXOS8700_REGISTER_STATUS = const(0x00)
-_FXOS8700_REGISTER_OUT_X_MSB = const(0x01)
-_FXOS8700_REGISTER_OUT_X_LSB = const(0x02)
-_FXOS8700_REGISTER_OUT_Y_MSB = const(0x03)
-_FXOS8700_REGISTER_OUT_Y_LSB = const(0x04)
-_FXOS8700_REGISTER_OUT_Z_MSB = const(0x05)
-_FXOS8700_REGISTER_OUT_Z_LSB = const(0x06)
-_FXOS8700_REGISTER_WHO_AM_I = const(0x0D)    # 11000111   r
+# pylint: disable=bad-whitespace
+_FXOS8700_ADDRESS               = const(0x1F)   # 0011111
+_FXOS8700_ID                    = const(0xC7)        # 1100 0111
+_FXOS8700_REGISTER_STATUS       = const(0x00)
+_FXOS8700_REGISTER_OUT_X_MSB    = const(0x01)
+_FXOS8700_REGISTER_OUT_X_LSB    = const(0x02)
+_FXOS8700_REGISTER_OUT_Y_MSB    = const(0x03)
+_FXOS8700_REGISTER_OUT_Y_LSB    = const(0x04)
+_FXOS8700_REGISTER_OUT_Z_MSB    = const(0x05)
+_FXOS8700_REGISTER_OUT_Z_LSB    = const(0x06)
+_FXOS8700_REGISTER_WHO_AM_I     = const(0x0D)    # 11000111   r
 _FXOS8700_REGISTER_XYZ_DATA_CFG = const(0x0E)
-_FXOS8700_REGISTER_CTRL_REG1 = const(0x2A)   # 00000000   r/w
-_FXOS8700_REGISTER_CTRL_REG2 = const(0x2B)   # 00000000   r/w
-_FXOS8700_REGISTER_CTRL_REG3 = const(0x2C)   # 00000000   r/w
-_FXOS8700_REGISTER_CTRL_REG4 = const(0x2D)   # 00000000   r/w
-_FXOS8700_REGISTER_CTRL_REG5 = const(0x2E)   # 00000000   r/w
-_FXOS8700_REGISTER_MSTATUS = const(0x32)
-_FXOS8700_REGISTER_MOUT_X_MSB = const(0x33)
-_FXOS8700_REGISTER_MOUT_X_LSB = const(0x34)
-_FXOS8700_REGISTER_MOUT_Y_MSB = const(0x35)
-_FXOS8700_REGISTER_MOUT_Y_LSB = const(0x36)
-_FXOS8700_REGISTER_MOUT_Z_MSB = const(0x37)
-_FXOS8700_REGISTER_MOUT_Z_LSB = const(0x38)
-_FXOS8700_REGISTER_MCTRL_REG1 = const(0x5B)   # 00000000   r/w
-_FXOS8700_REGISTER_MCTRL_REG2 = const(0x5C)   # 00000000   r/w
-_FXOS8700_REGISTER_MCTRL_REG3 = const(0x5D)   # 00000000   r/w
-_ACCEL_MG_LSB_2G = 0.000244
-_ACCEL_MG_LSB_4G = 0.000488
-_ACCEL_MG_LSB_8G = 0.000976
-_MAG_UT_LSB = 0.1
-_SENSORS_GRAVITY_STANDARD = 9.80665
+_FXOS8700_REGISTER_CTRL_REG1    = const(0x2A)   # 00000000   r/w
+_FXOS8700_REGISTER_CTRL_REG2    = const(0x2B)   # 00000000   r/w
+_FXOS8700_REGISTER_CTRL_REG3    = const(0x2C)   # 00000000   r/w
+_FXOS8700_REGISTER_CTRL_REG4    = const(0x2D)   # 00000000   r/w
+_FXOS8700_REGISTER_CTRL_REG5    = const(0x2E)   # 00000000   r/w
+_FXOS8700_REGISTER_MSTATUS      = const(0x32)
+_FXOS8700_REGISTER_MOUT_X_MSB   = const(0x33)
+_FXOS8700_REGISTER_MOUT_X_LSB   = const(0x34)
+_FXOS8700_REGISTER_MOUT_Y_MSB   = const(0x35)
+_FXOS8700_REGISTER_MOUT_Y_LSB   = const(0x36)
+_FXOS8700_REGISTER_MOUT_Z_MSB   = const(0x37)
+_FXOS8700_REGISTER_MOUT_Z_LSB   = const(0x38)
+_FXOS8700_REGISTER_MCTRL_REG1   = const(0x5B)   # 00000000   r/w
+_FXOS8700_REGISTER_MCTRL_REG2   = const(0x5C)   # 00000000   r/w
+_FXOS8700_REGISTER_MCTRL_REG3   = const(0x5D)   # 00000000   r/w
+_ACCEL_MG_LSB_2G                = 0.000244
+_ACCEL_MG_LSB_4G                = 0.000488
+_ACCEL_MG_LSB_8G                = 0.000976
+_MAG_UT_LSB                     = 0.1
+_SENSORS_GRAVITY_STANDARD       = 9.80665
+# pylint: enable=bad-whitespace
 
 # User-facing constants/module-level globals:
 ACCEL_RANGE_2G = 0x00
@@ -164,6 +166,10 @@ def read_raw_accel_mag(self):
         return ((accel_raw_x, accel_raw_y, accel_raw_z),
                 (mag_raw_x, mag_raw_y, mag_raw_z))
 
+    # pylint is confused and incorrectly marking this function as bad return
+    # types.  Perhaps it doesn't understand map returns an iterable value.
+    # Disable the warning.
+    # pylint: disable=inconsistent-return-statements
     @property
     def accelerometer(self):
         """Read the acceleration from the accelerometer and return its X, Y, Z axis values as a
@@ -180,6 +186,7 @@ def accelerometer(self):
         elif self._accel_range == ACCEL_RANGE_8G:
             return map(lambda x: x * _ACCEL_MG_LSB_8G * _SENSORS_GRAVITY_STANDARD,
                        accel_raw)
+    # pylint: enable=inconsistent-return-statements
 
     @property
     def magnetometer(self):