Hologram Python SDK v0.7.1 release

Author: tzhenghao

Hologram/Cloud.py

@@ -13,7 +13,7 @@
 from Network import NetworkManager
 from Authentication import *
 
-__version__ = '0.7.0'
+__version__ = '0.7.1'
 
 class Cloud(object):
 

Hologram/Network/Cellular.py

@@ -68,6 +68,9 @@ def connect(self, timeout = DEFAULT_CELLULAR_TIMEOUT):
 
         if success:
             self.logger.info('Successfully connected to cell network')
+            # Disable at sockets mode since we're already establishing PPP.
+            # This call is needed in certain modems that have limited interfaces to work with.
+            self.disable_at_sockets_mode()
             self._connection_status = CLOUD_CONNECTED
             self.event.broadcast('cellular.connected')
             super(Cellular, self).connect()

Hologram/Network/Modem/Modem.py

@@ -319,7 +319,7 @@ def close_socket(self, socket_identifier=None):
 
         ok, r = self.set('+USOCL', "%s" % socket_identifier)
         if ok != ModemResult.OK:
-            self.logger.error('Failed to close socket')
+            self.logger.info('Failed to close socket')
 
     def debugwrite(self, x, hide=False):
         if not hide:
@@ -381,6 +381,8 @@ def handleURC(self, urc):
             self._handle_listen_urc(urc)
             self.last_read_payload_length = 0
             next_urc_state = Modem.SOCKET_RECEIVE_READ
+        else:
+            self.logger.debug("URC was not handled. \'%s\'",  urc)
 
         self.urc_state = next_urc_state
 
@@ -565,15 +567,28 @@ def _parsePDU(self, header, pdu):
     def is_connected(self):
         return self.is_registered()
 
-    #EXPECTS: '+CREG' or '+CGREG'
+    @staticmethod
+    def _check_registered_helper(cmd, result):
+        r = None
+        if isinstance(result, list) and len(result) > 0:
+            # If more than one response is provided, assume that only
+            # the last response is of interest and that the
+            # rest are uncaught URCs that we should disregard.
+            r = result[-1]
+        else:
+            r = result
+
+        regstatus = int(r.lstrip(cmd).lstrip(': ').split(',')[1])
+        # 1: registered home network
+        # 5: registered roaming
+        return regstatus == 1 or regstatus == 5
+
+    #EXPECTS: '+CREG', '+CGREG', or '+CEREG'
     def check_registered(self, cmd):
         ok, r = self.read(cmd)
         if ok == ModemResult.OK:
             try:
-                regstatus = int(r.lstrip(cmd).lstrip(': ').split(',')[1])
-                # 1: registered home network
-                # 5: registered roaming
-                return regstatus == 1 or regstatus == 5
+                return Modem._check_registered_helper(cmd, r)
             except (IndexError, ValueError) as e:
                 self.logger.error(repr(e))
         return False

sftp-config.json

@@ -40,4 +40,4 @@ def test_invalid_send_sms(self):
     def test_sdk_version(self):
         cloud = Cloud(None, send_host = '127.0.0.1', send_port = 9999)
 
-        assert cloud.version == '0.7.0'
+        assert cloud.version == '0.7.1'

tests/MessageMode/test_Cloud.py

@@ -30,3 +30,34 @@ def test_get_result_string(self):
         assert modem.getResultString(-2) == 'Modem error'
         assert modem.getResultString(-3) == 'Modem response doesn\'t match expected return value'
         assert modem.getResultString(-99) == 'Unknown response code'
+
+
+# pylint: disable=W0212
+from Hologram.Network.Modem.Modem import Modem
+class TestModemProtectedMethods(object):
+    def test_check_registered_string(self):
+        result = '+CREG: 2,5,"5585","404C790",6'
+        registered = Modem._check_registered_helper('+CREG', result)
+        assert registered == True
+
+    def test_check_registered_short_list(self):
+        result = ['+CREG: 5,"5585","404C78A",6',
+                  '+CREG: 5,"5585","404C790",6',
+                  '+CREG: 2,5,"5585","404C790",6']
+        registered = Modem._check_registered_helper('+CREG', result)
+        assert registered == True
+
+    def test_check_registered_long_list(self):
+        result = ['+CREG: 5,"5585","404EF4D",6',
+                  '+CREG: 5,"5585","404C816",6',
+                  '+CREG: 5,"5585","404C790",6',
+                  '+CREG: 5,"5585","404C816",6',
+                  '+CREG: 5,"5585","404EF4D",6',
+                  '+CREG: 5,"5585","404C78A",6',
+                  '+CREG: 5,"5585","404C790",6',
+                  '+CREG: 5,"5585","404C816",6',
+                  '+CREG: 2',
+                  '+CREG: 5,"5585","404C790",6',
+                  '+CREG: 2,5,"5585","404C790",6']
+        registered = Modem._check_registered_helper('+CREG', result)
+        assert registered == True

tests/Modem/test_Modem.py

@@ -1 +1 @@
-0.7.0
+0.7.1