Lots of time spent to get tox lint tests passing. Much cleaner code now.

Author: MisterWil

abodecl.py

@@ -10,13 +10,14 @@
 I am in no way affiliated with Blink, nor Immedia Inc.
 """
 
-import sys
 import argparse
+import sys
 import time
-import abodepy
 
+import abodepy
 from helpers.constants import (ALL_MODES, ALL_MODES_STR)
 
+
 PARSER = argparse.ArgumentParser()
 
 PARSER.add_argument('--username', help='Username', required=True)
@@ -26,7 +27,8 @@
 PARSER.add_argument('--arm', help='Arm Alarm To Mode', required=False)
 PARSER.add_argument('--devices', help='List All Devices',
                     required=False, default=False, action="store_true")
-PARSER.add_argument('--device', help='Get Device', required=False, action='append')
+PARSER.add_argument('--device', help='Get Device',
+                    required=False, action='append')
 PARSER.add_argument('--listen', help='Listen For Device Updates',
                     required=False, default=False, action="store_true")
 PARSER.add_argument('--debug', help='Output Debugging',
@@ -55,15 +57,22 @@
     else:
         print("Mode failed to change to: %s" % ARGS['arm'])
 
+
 def _device_print(dev, append=''):
-    print("Device Name: %s, Device ID: %s, Device Type: %s, Device Status: %s%s" % (
-                dev.name, dev.device_id, dev.type, dev.status, append))
+    print("Device Name: %s, ID: %s, Type: %s, Status: %s%s" % (
+        dev.name, dev.device_id, dev.type, dev.status, append))
+
 
 # Print out all devices.
 if ARGS['devices']:
     for device in ABODE.get_devices():
         _device_print(device)
 
+
+def _device_callback(dev):
+    _device_print(dev, ", At: " + time.strftime("%Y-%m-%d %H:%M:%S"))
+
+
 # Print out specific devices by device id.
 if ARGS['device']:
     for device_id in ARGS['device']:
@@ -77,9 +86,6 @@ def _device_print(dev, append=''):
         else:
             print("Could not find device with id: %s" % device_id)
 
-def _device_callback(dev):
-    _device_print(dev, ", At: " + time.strftime("%Y-%m-%d %H:%M:%S"))
-
 # Start device change listener.
 if ARGS['listen']:
     # If no devices were specified then we listen to all devices.