From dfd8d33debeeb771dae7017855991fb12243dad0 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 31 May 2019 18:12:24 -0400 Subject: [PATCH 1/2] return None instead of -1 --- adafruit_azureiot.py | 8 ++++---- examples/azureiot_simpletest.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/adafruit_azureiot.py b/adafruit_azureiot.py index 1c50fcd..625c472 100644 --- a/adafruit_azureiot.py +++ b/adafruit_azureiot.py @@ -91,8 +91,8 @@ def _parse_http_status(status_code, status_reason): # Cloud-to-Device Messaging def get_hub_message(self): - """Returns a message from a Microsoft Azure IoT Hub (Cloud-to-Device), or -1 - if the message queue is empty. + """Returns a message from a Microsoft Azure IoT Hub (Cloud-to-Device). + Returns None if the message queue is empty. NOTE: HTTP Cloud-to-Device messages are throttled. Poll every 25+ minutes. """ reject_message = True @@ -102,7 +102,7 @@ def get_hub_message(self): AZ_API_VER) data = self._get(path, is_c2d=True) if data == 204: # device's message queue is empty - return -1 + return None etag = data[1]['etag'] if etag: # either complete or nack the message reject_message = False @@ -113,7 +113,7 @@ def get_hub_message(self): del_status = self._delete(path_complete) if del_status == 204: return data[0] - return -1 + return None # Device-to-Cloud Messaging def send_device_message(self, message): diff --git a/examples/azureiot_simpletest.py b/examples/azureiot_simpletest.py index 3939724..60afab5 100644 --- a/examples/azureiot_simpletest.py +++ b/examples/azureiot_simpletest.py @@ -43,7 +43,7 @@ # Microsoft suggests a polling interval of the below code for every 25 minutes. print('Receiving a message from an Azure IoT Hub...') message = hub.get_hub_message() -if message == -1: +if message == None: print('IoT Hub Message Queue is empty!') else: print(message) From 500356e0e929850b41accab2f85635e7071d03b5 Mon Sep 17 00:00:00 2001 From: brentru Date: Fri, 31 May 2019 18:19:01 -0400 Subject: [PATCH 2/2] satisfy linter --- examples/azureiot_simpletest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/azureiot_simpletest.py b/examples/azureiot_simpletest.py index 60afab5..a2c8f8b 100644 --- a/examples/azureiot_simpletest.py +++ b/examples/azureiot_simpletest.py @@ -43,7 +43,7 @@ # Microsoft suggests a polling interval of the below code for every 25 minutes. print('Receiving a message from an Azure IoT Hub...') message = hub.get_hub_message() -if message == None: +if message is None: print('IoT Hub Message Queue is empty!') else: print(message)