From bc9582c79c06add70345eb31d5396dfe7e24d8c8 Mon Sep 17 00:00:00 2001 From: codingbandit Date: Fri, 1 Jan 2021 20:54:40 -0500 Subject: [PATCH 1/4] fixed imports for adafruit_minimqtt --- adafruit_azureiot/iot_mqtt.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adafruit_azureiot/iot_mqtt.py b/adafruit_azureiot/iot_mqtt.py index 6d61b91..04f53f2 100644 --- a/adafruit_azureiot/iot_mqtt.py +++ b/adafruit_azureiot/iot_mqtt.py @@ -31,8 +31,8 @@ import gc import json import time -import adafruit_minimqtt as minimqtt -from adafruit_minimqtt import MQTT +import adafruit_minimqtt.adafruit_minimqtt as minimqtt +from adafruit_minimqtt.adafruit_minimqtt import MQTT import adafruit_logging as logging from .iot_error import IoTError from .keys import compute_derived_symmetric_key From 393525f1110c33d5443b911c58702b535df65ad0 Mon Sep 17 00:00:00 2001 From: codingbandit Date: Fri, 1 Jan 2021 21:48:24 -0500 Subject: [PATCH 2/4] attempting to begin to appease the linting gods --- adafruit_azureiot/base64.py | 4 ++-- adafruit_azureiot/device_registration.py | 4 ++-- adafruit_azureiot/iothub_device.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/adafruit_azureiot/base64.py b/adafruit_azureiot/base64.py index 4cce82d..8f1a461 100644 --- a/adafruit_azureiot/base64.py +++ b/adafruit_azureiot/base64.py @@ -46,8 +46,8 @@ def _bytes_from_decode_data(data: str): try: return data.encode("ascii") - except: - raise ValueError("string argument should contain only ASCII characters") + except Exception as e: + raise ValueError("string argument should contain only ASCII characters") from e def b64encode(toencode: bytes) -> bytes: diff --git a/adafruit_azureiot/device_registration.py b/adafruit_azureiot/device_registration.py index 6b1f8ef..19617e3 100644 --- a/adafruit_azureiot/device_registration.py +++ b/adafruit_azureiot/device_registration.py @@ -104,7 +104,7 @@ def _loop_assign(self, operation_id, headers) -> str: except ValueError as error: err = "ERROR: " + str(error) + " => " + str(response) self._logger.error(err) - raise DeviceRegistrationError(err) + raise DeviceRegistrationError(err) from error loop_try = 0 @@ -225,7 +225,7 @@ def register_device(self, expiry: int) -> str: except ValueError as error: err = "ERROR: non JSON is received from " + constants.DPS_END_POINT + " => " + str(response) + " .. message : " + str(error) self._logger.error(err) - raise DeviceRegistrationError(err) + raise DeviceRegistrationError(err) from error if "errorCode" in data: err = "DPS => " + str(data) diff --git a/adafruit_azureiot/iothub_device.py b/adafruit_azureiot/iothub_device.py index c7900d6..bba43ba 100755 --- a/adafruit_azureiot/iothub_device.py +++ b/adafruit_azureiot/iothub_device.py @@ -146,8 +146,8 @@ def __init__(self, socket, iface, device_connection_string: str, token_expires: try: cs_args = device_connection_string.split(DELIMITER) connection_string_values = dict(arg.split(VALUE_SEPARATOR, 1) for arg in cs_args) - except (ValueError, AttributeError): - raise ValueError("Connection string is required and should not be empty or blank and must be supplied as a string") + except (ValueError, AttributeError) as e: + raise ValueError("Connection string is required and should not be empty or blank and must be supplied as a string") from e if len(cs_args) != len(connection_string_values): raise ValueError("Invalid Connection String - Unable to parse") From 712a708d89d3ea7a04b88dc7b51ffd84c9501350 Mon Sep 17 00:00:00 2001 From: codingbandit Date: Fri, 1 Jan 2021 21:53:44 -0500 Subject: [PATCH 3/4] continued linting --- adafruit_azureiot/base64.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/adafruit_azureiot/base64.py b/adafruit_azureiot/base64.py index 8f1a461..ab74bec 100644 --- a/adafruit_azureiot/base64.py +++ b/adafruit_azureiot/base64.py @@ -46,8 +46,8 @@ def _bytes_from_decode_data(data: str): try: return data.encode("ascii") - except Exception as e: - raise ValueError("string argument should contain only ASCII characters") from e + except Exception as exc: + raise ValueError("string argument should contain only ASCII characters") from exc def b64encode(toencode: bytes) -> bytes: From d7c91400b23a3a99528ff03ea7734c58f3bce7d1 Mon Sep 17 00:00:00 2001 From: codingbandit Date: Fri, 1 Jan 2021 22:12:16 -0500 Subject: [PATCH 4/4] final appeasement of the linting gods --- adafruit_azureiot/device_registration.py | 2 +- adafruit_azureiot/iot_error.py | 2 +- adafruit_azureiot/quote.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adafruit_azureiot/device_registration.py b/adafruit_azureiot/device_registration.py index 19617e3..15f85df 100644 --- a/adafruit_azureiot/device_registration.py +++ b/adafruit_azureiot/device_registration.py @@ -49,7 +49,7 @@ class DeviceRegistrationError(Exception): """ def __init__(self, message): - super(DeviceRegistrationError, self).__init__(message) + super().__init__(message) self.message = message diff --git a/adafruit_azureiot/iot_error.py b/adafruit_azureiot/iot_error.py index 767351c..1ca604b 100644 --- a/adafruit_azureiot/iot_error.py +++ b/adafruit_azureiot/iot_error.py @@ -38,5 +38,5 @@ def __init__(self, message: str): """Create the IoT Error :param str message: The error message """ - super(IoTError, self).__init__(message) + super().__init__(message) self.message = message diff --git a/adafruit_azureiot/quote.py b/adafruit_azureiot/quote.py index 5c8dd7a..704188c 100644 --- a/adafruit_azureiot/quote.py +++ b/adafruit_azureiot/quote.py @@ -128,7 +128,7 @@ class Quoter(defaultdict): # of cached keys don't call Python code at all). def __init__(self, safe): """safe: bytes object.""" - super(Quoter, self).__init__() + super().__init__() self.safe = _ALWAYS_SAFE.union(safe) def __missing__(self, b):