From 89fb70a519010f1df205564a732bc4008d598b5b Mon Sep 17 00:00:00 2001
From: Scott Petersen <scott@nutech.com>
Date: Fri, 6 Dec 2013 16:56:39 -0800
Subject: [PATCH] Switched examples to simpler handler definitions.

---
 examples/alarm_email.py           |  3 +--
 examples/basics.py                |  6 ++----
 examples/detection.py             | 19 +++++++------------
 examples/rf_device.py             |  8 +++-----
 examples/serialport.py            |  6 ++----
 examples/socket_example.py        |  6 ++----
 examples/ssl_socket.py            |  6 ++----
 examples/virtual_zone_expander.py |  8 ++------
 8 files changed, 21 insertions(+), 41 deletions(-)

diff --git a/examples/alarm_email.py b/examples/alarm_email.py
index 6af6318..5dcf3f8 100644
--- a/examples/alarm_email.py
+++ b/examples/alarm_email.py
@@ -31,11 +31,10 @@ def main():
     except Exception, ex:
         print 'Exception:', ex
 
-def handle_alarm(sender, *args, **kwargs):
+def handle_alarm(sender, status):
     """
     Handles alarm events from the AlarmDecoder.
     """
-    status = kwargs['status']
     text = "Alarm status: {0}".format(status)
 
     # Build the email message
diff --git a/examples/basics.py b/examples/basics.py
index acc75ae..2714057 100644
--- a/examples/basics.py
+++ b/examples/basics.py
@@ -19,13 +19,11 @@ def main():
     except Exception, ex:
         print 'Exception:', ex
 
-def handle_message(sender, *args, **kwargs):
+def handle_message(sender, message):
     """
     Handles message events from the AlarmDecoder.
     """
-    msg = kwargs['message']
-
-    print sender, msg.raw
+    print sender, message.raw
 
 if __name__ == '__main__':
     main()
diff --git a/examples/detection.py b/examples/detection.py
index 4132d26..df8f0cd 100644
--- a/examples/detection.py
+++ b/examples/detection.py
@@ -44,31 +44,26 @@ def create_device(device_args):
 
     return device
 
-def handle_message(sender, *args, **kwargs):
+def handle_message(sender, message):
     """
     Handles message events from the AlarmDecoder.
     """
-    msg = kwargs['message']
+    print sender, message.raw
 
-    print sender, msg.raw
-
-def handle_attached(sender, *args, **kwargs):
+def handle_attached(sender, device):
     """
     Handles attached events from USBDevice.start_detection().
     """
-    device_args = kwargs['device']
-
     # Create the device from the specified device arguments.
-    device = create_device(device_args)
-    __devices[device.id] = device
+    dev = create_device(device)
+    __devices[dev.id] = dev
 
-    print 'attached', device.id
+    print 'attached', dev.id
 
-def handle_detached(sender, *args, **kwargs):
+def handle_detached(sender, device):
     """
     Handles detached events from USBDevice.start_detection().
     """
-    device = kwargs['device']
     vendor, product, sernum, ifcount, description = device
 
     # Close and remove the device from our list.
diff --git a/examples/rf_device.py b/examples/rf_device.py
index d47eb0b..a5faaae 100644
--- a/examples/rf_device.py
+++ b/examples/rf_device.py
@@ -29,15 +29,13 @@ def main():
     except Exception, ex:
         print 'Exception:', ex
 
-def handle_rfx(sender, *args, **kwargs):
+def handle_rfx(sender, message):
     """
     Handles RF message events from the AlarmDecoder.
     """
-    msg = kwargs['message']
-
     # Check for our target serial number and loop
-    if msg.serial_number == RF_DEVICE_SERIAL_NUMBER and msg.loop[0] == True:
-        print msg.serial_number, 'triggered loop #1'
+    if message.serial_number == RF_DEVICE_SERIAL_NUMBER and message.loop[0] == True:
+        print message.serial_number, 'triggered loop #1'
 
 if __name__ == '__main__':
     main()
diff --git a/examples/serialport.py b/examples/serialport.py
index 90b28fe..b504d59 100644
--- a/examples/serialport.py
+++ b/examples/serialport.py
@@ -26,13 +26,11 @@ def main():
     except Exception, ex:
         print 'Exception:', ex
 
-def handle_message(sender, *args, **kwargs):
+def handle_message(sender, message):
     """
     Handles message events from the AlarmDecoder.
     """
-    msg = kwargs['message']
-
-    print sender, msg.raw
+    print sender, message.raw
 
 if __name__ == '__main__':
     main()
diff --git a/examples/socket_example.py b/examples/socket_example.py
index bb975e9..9e4bce6 100644
--- a/examples/socket_example.py
+++ b/examples/socket_example.py
@@ -24,13 +24,11 @@ def main():
     except Exception, ex:
         print 'Exception:', ex
 
-def handle_message(sender, *args, **kwargs):
+def handle_message(sender, message):
     """
     Handles message events from the AlarmDecoder.
     """
-    msg = kwargs['message']
-
-    print sender, msg.raw
+    print sender, message.raw
 
 if __name__ == '__main__':
     main()
diff --git a/examples/ssl_socket.py b/examples/ssl_socket.py
index 1fffb8d..50289c5 100644
--- a/examples/ssl_socket.py
+++ b/examples/ssl_socket.py
@@ -38,13 +38,11 @@ def main():
     except Exception, ex:
         print 'Exception:', ex
 
-def handle_message(sender, *args, **kwargs):
+def handle_message(sender, message):
     """
     Handles message events from the AlarmDecoder.
     """
-    msg = kwargs['message']
-
-    print sender, msg.raw
+    print sender, message.raw
 
 if __name__ == '__main__':
     main()
diff --git a/examples/virtual_zone_expander.py b/examples/virtual_zone_expander.py
index 3bfd2ee..900c048 100644
--- a/examples/virtual_zone_expander.py
+++ b/examples/virtual_zone_expander.py
@@ -47,23 +47,19 @@ def main():
     except Exception, ex:
         print 'Exception:', ex
 
-def handle_zone_fault(sender, *args, **kwargs):
+def handle_zone_fault(sender, zone):
     """
     Handles zone fault messages.
     """
-    zone = kwargs['zone']
-
     print 'zone faulted', zone
 
     # Restore the zone
     sender.clear_zone(zone)
 
-def handle_zone_restore(sender, *args, **kwargs):
+def handle_zone_restore(sender, zone):
     """
     Handles zone restore messages.
     """
-    zone = kwargs['zone']
-
     print 'zone cleared', zone
 
 if __name__ == '__main__':