Made SSL force the handshake instead of waiting until communication occurs. This allows us to grab the config automatically in open.

examples/alarm_email.py

@@ -26,9 +26,6 @@ def main():
         device.on_alarm += handle_alarm
         device.open()
 
-        # Retrieve the device configuration
-        device.get_config()
-
         # Wait for events
         while True:
             time.sleep(1)

examples/basics.py

@@ -13,7 +13,6 @@ def main():
         # Set up an event handler and open the device
         device.on_message += handle_message
         device.open()
-        device.get_config()
 
         # Wait for events.
         while True:

examples/rf_device.py

@@ -23,7 +23,6 @@ def main():
         # Set up an event handler and open the device
         device.on_rfx_message += handle_rfx
         device.open()
-        device.get_config()
 
         # Wait for events.
         while True:

examples/serialport.py

@@ -17,7 +17,6 @@ def main():
         # Set up an event handler and open the device
         device.on_message += handle_message
         device.open(baudrate=BAUDRATE)            # Override the default SerialDevice baudrate.
-        device.get_config()
 
         # Wait for events.
         while True:

examples/socket_example.py

@@ -18,7 +18,6 @@ def main():
         # Set up an event handler and open the device
         device.on_message += handle_message
         device.open()
-        device.get_config()
 
         # Wait for events.
         while True:

examples/ssl_socket.py

@@ -33,9 +33,6 @@ def main():
         device.on_message += handle_message
         device.open()
 
-        time.sleep(1)          # Allow time for SSL handshake to complete.
-        device.get_config()
-
         # Wait for events.
         while True:
             time.sleep(1)

examples/virtual_zone_expander.py

@@ -35,7 +35,6 @@ def main():
         device.on_zone_restore += handle_zone_restore
 
         device.open()
-        device.get_config()
 
         # Wait for events.
         last_update = time.time()

pyad2/ad2.py

@@ -105,6 +105,7 @@ class AD2(object):
         """
         self._wire_events()
         self._device.open(baudrate=baudrate, no_reader_thread=no_reader_thread)
+        self.get_config()
 
     def close(self):
         """

pyad2/devices.py

@@ -880,6 +880,9 @@ class SocketDevice(Device):
 
             self._device.connect((self._host, self._port))
 
+            if self._use_ssl:
+                self._device.do_handshake()
+
             self._id = '{0}:{1}'.format(self._host, self._port)
 
         except socket.error, err: